This commit was manufactured by cvs2git to create tag 'openssh_1_0_0_a'.openssh_1_0_0_a

163 files changed, 13814 insertions, 26498 deletions

diff --git a/src/lib/libcrypto/LPdir_nyi.c b/src/lib/libcrypto/LPdir_nyi.c
new file mode 100644
index 0000000000..6c1a50e6a8
--- /dev/null
+++ b/src/lib/libcrypto/LPdir_nyi.c
@@ -0,0 +1,42 @@
+/* $LP: LPlib/source/LPdir_win.c,v 1.1 2004/06/14 10:07:56 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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.
+ */
+
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+struct LP_dir_context_st { void *dummy; };
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+        {
+        errno = EINVAL;
+        return 0;
+        }
+int LP_find_file_end(LP_DIR_CTX **ctx)
+        {
+        errno = EINVAL;
+        return 0;
+        }
diff --git a/src/lib/libcrypto/LPdir_unix.c b/src/lib/libcrypto/LPdir_unix.c
new file mode 100644
index 0000000000..b004cd99e8
--- /dev/null
+++ b/src/lib/libcrypto/LPdir_unix.c
@@ -0,0 +1,127 @@
+/* $LP: LPlib/source/LPdir_unix.c,v 1.11 2004/09/23 22:07:22 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``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 COPYRIGHT
+ * OWNER 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.
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <errno.h>
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+/* The POSIXly macro for the maximum number of characters in a file path
+   is NAME_MAX.  However, some operating systems use PATH_MAX instead.
+   Therefore, it seems natural to first check for PATH_MAX and use that,
+   and if it doesn't exist, use NAME_MAX. */
+#if defined(PATH_MAX)
+# define LP_ENTRY_SIZE PATH_MAX
+#elif defined(NAME_MAX)
+# define LP_ENTRY_SIZE NAME_MAX
+#endif
+
+/* Of course, there's the possibility that neither PATH_MAX nor NAME_MAX
+   exist.  It's also possible that NAME_MAX exists but is define to a
+   very small value (HP-UX offers 14), so we need to check if we got a
+   result, and if it meets a minimum standard, and create or change it
+   if not. */
+#if !defined(LP_ENTRY_SIZE) || LP_ENTRY_SIZE<255
+# undef LP_ENTRY_SIZE
+# define LP_ENTRY_SIZE 255
+#endif
+
+struct LP_dir_context_st
+{
+  DIR *dir;
+  char entry_name[LP_ENTRY_SIZE+1];
+};
+
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+{
+  struct dirent *direntry = NULL;
+
+  if (ctx == NULL || directory == NULL)
+    {
+      errno = EINVAL;
+      return 0;
+    }
+
+  errno = 0;
+  if (*ctx == NULL)
+    {
+      *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
+      if (*ctx == NULL)
+        {
+          errno = ENOMEM;
+          return 0;
+        }
+      memset(*ctx, '\0', sizeof(LP_DIR_CTX));
+
+      (*ctx)->dir = opendir(directory);
+      if ((*ctx)->dir == NULL)
+        {
+          int save_errno = errno; /* Probably not needed, but I'm paranoid */
+          free(*ctx);
+          *ctx = NULL;
+          errno = save_errno;
+          return 0;
+        }
+    }
+
+  direntry = readdir((*ctx)->dir);
+  if (direntry == NULL)
+    {
+      return 0;
+    }
+
+  strncpy((*ctx)->entry_name, direntry->d_name, sizeof((*ctx)->entry_name) - 1);
+  (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0';
+  return (*ctx)->entry_name;
+}
+
+int LP_find_file_end(LP_DIR_CTX **ctx)
+{
+  if (ctx != NULL && *ctx != NULL)
+    {
+      int ret = closedir((*ctx)->dir);
+
+      free(*ctx);
+      switch (ret)
+        {
+        case 0:
+          return 1;
+        case -1:
+          return 0;
+        default:
+          break;
+        }
+    }
+  errno = EINVAL;
+  return 0;
+}
diff --git a/src/lib/libcrypto/LPdir_vms.c b/src/lib/libcrypto/LPdir_vms.c
new file mode 100644
index 0000000000..85b427a623
--- /dev/null
+++ b/src/lib/libcrypto/LPdir_vms.c
@@ -0,0 +1,199 @@
+/* $LP: LPlib/source/LPdir_vms.c,v 1.20 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``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 COPYRIGHT
+ * OWNER 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.
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <descrip.h>
+#include <namdef.h>
+#include <rmsdef.h>
+#include <libfildef.h>
+#include <lib$routines.h>
+#include <strdef.h>
+#include <str$routines.h>
+#include <stsdef.h>
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+/* Because some compiler options hide this macor */
+#ifndef EVMSERR
+#define EVMSERR         65535  /* error for non-translatable VMS errors */
+#endif
+
+struct LP_dir_context_st
+{
+  unsigned long VMS_context;
+#ifdef NAML$C_MAXRSS
+  char filespec[NAML$C_MAXRSS+1];
+  char result[NAML$C_MAXRSS+1];
+#else
+  char filespec[256];
+  char result[256];
+#endif
+  struct dsc$descriptor_d filespec_dsc;
+  struct dsc$descriptor_d result_dsc;
+};
+
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+{
+  int status;
+  char *p, *r;
+  size_t l;
+  unsigned long flags = 0;
+#ifdef NAML$C_MAXRSS
+  flags |= LIB$M_FIL_LONG_NAMES;
+#endif
+
+  if (ctx == NULL || directory == NULL)
+    {
+      errno = EINVAL;
+      return 0;
+    }
+
+  errno = 0;
+  if (*ctx == NULL)
+    {
+      size_t filespeclen = strlen(directory);
+      char *filespec = NULL;
+
+      /* MUST be a VMS directory specification!  Let's estimate if it is. */
+      if (directory[filespeclen-1] != ']'
+          && directory[filespeclen-1] != '>'
+          && directory[filespeclen-1] != ':')
+        {
+          errno = EINVAL;
+          return 0;
+        }
+
+      filespeclen += 4;         /* "*.*;" */
+
+      if (filespeclen >
+#ifdef NAML$C_MAXRSS
+          NAML$C_MAXRSS
+#else
+          255
+#endif
+          )
+        {
+          errno = ENAMETOOLONG;
+          return 0;
+        }
+
+      *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
+      if (*ctx == NULL)
+        {
+          errno = ENOMEM;
+          return 0;
+        }
+      memset(*ctx, '\0', sizeof(LP_DIR_CTX));
+
+      strcpy((*ctx)->filespec,directory);
+      strcat((*ctx)->filespec,"*.*;");
+      (*ctx)->filespec_dsc.dsc$w_length = filespeclen;
+      (*ctx)->filespec_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+      (*ctx)->filespec_dsc.dsc$b_class = DSC$K_CLASS_S;
+      (*ctx)->filespec_dsc.dsc$a_pointer = (*ctx)->filespec;
+      (*ctx)->result_dsc.dsc$w_length = 0;
+      (*ctx)->result_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+      (*ctx)->result_dsc.dsc$b_class = DSC$K_CLASS_D;
+      (*ctx)->result_dsc.dsc$a_pointer = 0;
+    }
+
+  (*ctx)->result_dsc.dsc$w_length = 0;
+  (*ctx)->result_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+  (*ctx)->result_dsc.dsc$b_class = DSC$K_CLASS_D;
+  (*ctx)->result_dsc.dsc$a_pointer = 0;
+
+  status = lib$find_file(&(*ctx)->filespec_dsc, &(*ctx)->result_dsc,
+                         &(*ctx)->VMS_context, 0, 0, 0, &flags);
+
+  if (status == RMS$_NMF)
+    {
+      errno = 0;
+      vaxc$errno = status;
+      return NULL;
+    }
+
+  if(!$VMS_STATUS_SUCCESS(status))
+    {
+      errno = EVMSERR;
+      vaxc$errno = status;
+      return NULL;
+    }
+
+  /* Quick, cheap and dirty way to discard any device and directory,
+     since we only want file names */
+  l = (*ctx)->result_dsc.dsc$w_length;
+  p = (*ctx)->result_dsc.dsc$a_pointer;
+  r = p;
+  for (; *p; p++)
+    {
+      if (*p == '^' && p[1] != '\0') /* Take care of ODS-5 escapes */
+        {
+          p++;
+        }
+      else if (*p == ':' || *p == '>' || *p == ']')
+        {
+          l -= p + 1 - r;
+          r = p + 1;
+        }
+      else if (*p == ';')
+        {
+          l = p - r;
+          break;
+        }
+    }
+
+  strncpy((*ctx)->result, r, l);
+  (*ctx)->result[l] = '\0';
+  str$free1_dx(&(*ctx)->result_dsc);
+
+  return (*ctx)->result;
+}
+
+int LP_find_file_end(LP_DIR_CTX **ctx)
+{
+  if (ctx != NULL && *ctx != NULL)
+    {
+      int status = lib$find_file_end(&(*ctx)->VMS_context);
+
+      free(*ctx);
+
+      if(!$VMS_STATUS_SUCCESS(status))
+        {
+          errno = EVMSERR;
+          vaxc$errno = status;
+          return 0;
+        }
+      return 1;
+    }
+  errno = EINVAL;
+  return 0;
+}
+
diff --git a/src/lib/libcrypto/LPdir_win.c b/src/lib/libcrypto/LPdir_win.c
new file mode 100644
index 0000000000..702dbc730f
--- /dev/null
+++ b/src/lib/libcrypto/LPdir_win.c
@@ -0,0 +1,153 @@
+/* $LP: LPlib/source/LPdir_win.c,v 1.10 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``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 COPYRIGHT
+ * OWNER 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.
+ */
+#include <windows.h>
+#include <tchar.h>
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+/* We're most likely overcautious here, but let's reserve for
+    broken WinCE headers and explicitly opt for UNICODE call.
+    Keep in mind that our WinCE builds are compiled with -DUNICODE
+    [as well as -D_UNICODE]. */
+#if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
+# define FindFirstFile FindFirstFileW
+#endif
+#if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
+# define FindNextFile FindNextFileW
+#endif
+
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
+struct LP_dir_context_st
+{
+  WIN32_FIND_DATA ctx;
+  HANDLE handle;
+  char entry_name[NAME_MAX+1];
+};
+
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+{
+  if (ctx == NULL || directory == NULL)
+    {
+      errno = EINVAL;
+      return 0;
+    }
+
+  errno = 0;
+  if (*ctx == NULL)
+    {
+      *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
+      if (*ctx == NULL)
+        {
+          errno = ENOMEM;
+          return 0;
+        }
+      memset(*ctx, '\0', sizeof(LP_DIR_CTX));
+
+      if (sizeof(TCHAR) != sizeof(char))
+        {
+          TCHAR *wdir = NULL;
+          /* len_0 denotes string length *with* trailing 0 */ 
+          size_t index = 0,len_0 = strlen(directory) + 1;
+
+          wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR));
+          if (wdir == NULL)
+            {
+              free(*ctx);
+              *ctx = NULL;
+              errno = ENOMEM;
+              return 0;
+            }
+
+#ifdef LP_MULTIBYTE_AVAILABLE
+          if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, (WCHAR *)wdir, len_0))
+#endif
+            for (index = 0; index < len_0; index++)
+              wdir[index] = (TCHAR)directory[index];
+
+          (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx);
+
+          free(wdir);
+        }
+      else
+        (*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx);
+
+      if ((*ctx)->handle == INVALID_HANDLE_VALUE)
+        {
+          free(*ctx);
+          *ctx = NULL;
+          errno = EINVAL;
+          return 0;
+        }
+    }
+  else
+    {
+      if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE)
+        {
+          return 0;
+        }
+    }
+
+  if (sizeof(TCHAR) != sizeof(char))
+    {
+      TCHAR *wdir = (*ctx)->ctx.cFileName;
+      size_t index, len_0 = 0;
+
+      while (wdir[len_0] && len_0 < (sizeof((*ctx)->entry_name) - 1)) len_0++;
+      len_0++;
+
+#ifdef LP_MULTIBYTE_AVAILABLE
+      if (!WideCharToMultiByte(CP_ACP, 0, (WCHAR *)wdir, len_0, (*ctx)->entry_name,
+                               sizeof((*ctx)->entry_name), NULL, 0))
+#endif
+        for (index = 0; index < len_0; index++)
+          (*ctx)->entry_name[index] = (char)wdir[index];
+    }
+  else
+    strncpy((*ctx)->entry_name, (const char *)(*ctx)->ctx.cFileName,
+            sizeof((*ctx)->entry_name)-1);
+
+  (*ctx)->entry_name[sizeof((*ctx)->entry_name)-1] = '\0';
+
+  return (*ctx)->entry_name;
+}
+
+int LP_find_file_end(LP_DIR_CTX **ctx)
+{
+  if (ctx != NULL && *ctx != NULL)
+    {
+      FindClose((*ctx)->handle);
+      free(*ctx);
+      *ctx = NULL;
+      return 1;
+    }
+  errno = EINVAL;
+  return 0;
+}
diff --git a/src/lib/libcrypto/LPdir_win32.c b/src/lib/libcrypto/LPdir_win32.c
new file mode 100644
index 0000000000..e39872da52
--- /dev/null
+++ b/src/lib/libcrypto/LPdir_win32.c
@@ -0,0 +1,30 @@
+/* $LP: LPlib/source/LPdir_win32.c,v 1.3 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``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 COPYRIGHT
+ * OWNER 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.
+ */
+
+#define LP_SYS_WIN32
+#define LP_MULTIBYTE_AVAILABLE
+#include "LPdir_win.c"
diff --git a/src/lib/libcrypto/LPdir_wince.c b/src/lib/libcrypto/LPdir_wince.c
new file mode 100644
index 0000000000..ab0e1e6f4f
--- /dev/null
+++ b/src/lib/libcrypto/LPdir_wince.c
@@ -0,0 +1,31 @@
+/* $LP: LPlib/source/LPdir_wince.c,v 1.3 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``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 COPYRIGHT
+ * OWNER 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.
+ */
+
+#define LP_SYS_WINCE
+/* We might want to define LP_MULTIBYTE_AVAILABLE here.  It's currently
+   under investigation what the exact conditions would be */
+#include "LPdir_win.c"
diff --git a/src/lib/libcrypto/asn1/a_hdr.c b/src/lib/libcrypto/asn1/a_hdr.c
deleted file mode 100644
index d1c2a7b9e3..0000000000
--- a/src/lib/libcrypto/asn1/a_hdr.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* crypto/asn1/a_hdr.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/asn1.h>
-
-int i2d_ASN1_HEADER(ASN1_HEADER *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->header,       i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_len(a->data,         a->meth->i2d);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->header,       i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_put(a->data,         a->meth->i2d);
-
-        M_ASN1_I2D_finish();
-        }
-
-ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a, const unsigned char **pp,
-             long length)
-        {
-        M_ASN1_D2I_vars(a,ASN1_HEADER *,ASN1_HEADER_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get_x(ASN1_OCTET_STRING,ret->header,d2i_ASN1_OCTET_STRING);
-        if (ret->meth != NULL)
-                {
-                M_ASN1_D2I_get_x(void,ret->data,ret->meth->d2i);
-                }
-        else
-                {
-                if (a != NULL) (*a)=ret;
-                return(ret);
-                }
-        M_ASN1_D2I_Finish(a,ASN1_HEADER_free,ASN1_F_D2I_ASN1_HEADER);
-        }
-
-ASN1_HEADER *ASN1_HEADER_new(void)
-        {
-        ASN1_HEADER *ret=NULL;
-        ASN1_CTX c;
-
-        M_ASN1_New_Malloc(ret,ASN1_HEADER);
-        M_ASN1_New(ret->header,M_ASN1_OCTET_STRING_new);
-        ret->meth=NULL;
-        ret->data=NULL;
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_ASN1_HEADER_NEW);
-        }
-
-void ASN1_HEADER_free(ASN1_HEADER *a)
-        {
-        if (a == NULL) return;
-        M_ASN1_OCTET_STRING_free(a->header);
-        if (a->meth != NULL)
-                a->meth->destroy(a->data);
-        OPENSSL_free(a);
-        }
diff --git a/src/lib/libcrypto/asn1/a_meth.c b/src/lib/libcrypto/asn1/a_meth.c
deleted file mode 100644
index 50bea917e3..0000000000
--- a/src/lib/libcrypto/asn1/a_meth.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* crypto/asn1/a_meth.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/asn1.h>
-
-static  ASN1_METHOD ia5string_meth={
-        (I2D_OF(void))  i2d_ASN1_IA5STRING,
-        (D2I_OF(void))  d2i_ASN1_IA5STRING,
-        (void *(*)(void))ASN1_STRING_new,
-        (void (*)(void *))ASN1_STRING_free};
-
-static  ASN1_METHOD bit_string_meth={
-        (I2D_OF(void))  i2d_ASN1_BIT_STRING,
-        (D2I_OF(void))  d2i_ASN1_BIT_STRING,
-        (void *(*)(void))ASN1_STRING_new,
-        (void (*)(void *))ASN1_STRING_free};
-
-ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void)
-        {
-        return(&ia5string_meth);
-        }
-
-ASN1_METHOD *ASN1_BIT_STRING_asn1_meth(void)
-        {
-        return(&bit_string_meth);
-        }
diff --git a/src/lib/libcrypto/asn1/p8_key.c b/src/lib/libcrypto/asn1/p8_key.c
deleted file mode 100644
index 3a31248e14..0000000000
--- a/src/lib/libcrypto/asn1/p8_key.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* crypto/asn1/p8_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/objects.h>
-
-int i2d_X509_KEY(X509 *a, unsigned char **pp)
-        {
-        M_ASN1_I2D_vars(a);
-
-        M_ASN1_I2D_len(a->cert_info,    i2d_X509_CINF);
-        M_ASN1_I2D_len(a->sig_alg,      i2d_X509_ALGOR);
-        M_ASN1_I2D_len(a->signature,    i2d_ASN1_BIT_STRING);
-
-        M_ASN1_I2D_seq_total();
-
-        M_ASN1_I2D_put(a->cert_info,    i2d_X509_CINF);
-        M_ASN1_I2D_put(a->sig_alg,      i2d_X509_ALGOR);
-        M_ASN1_I2D_put(a->signature,    i2d_ASN1_BIT_STRING);
-
-        M_ASN1_I2D_finish();
-        }
-
-X509 *d2i_X509_KEY(X509 **a, unsigned char **pp, long length)
-        {
-        M_ASN1_D2I_vars(a,X509 *,X509_new);
-
-        M_ASN1_D2I_Init();
-        M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->cert_info,d2i_X509_CINF);
-        M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
-        M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
-        M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
-        }
-
-X509 *X509_KEY_new(void)
-        {
-        X509_KEY *ret=NULL;
-
-        M_ASN1_New_OPENSSL_malloc(ret,X509_KEY);
-        ret->references=1;
-        ret->type=NID
-        M_ASN1_New(ret->cert_info,X509_CINF_new);
-        M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
-        M_ASN1_New(ret->signature,ASN1_BIT_STRING_new);
-        return(ret);
-        M_ASN1_New_Error(ASN1_F_X509_NEW);
-        }
-
-void X509_KEY_free(X509 *a)
-        {
-        int i;
-
-        if (a == NULL) return;
-
-        i=CRYPTO_add_lock(&a->references,-1,CRYPTO_LOCK_X509_KEY);
-#ifdef REF_PRINT
-        REF_PRINT("X509_KEY",a);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"X509_KEY_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        X509_CINF_free(a->cert_info);
-        X509_ALGOR_free(a->sig_alg);
-        ASN1_BIT_STRING_free(a->signature);
-        OPENSSL_free(a);
-        }
-
diff --git a/src/lib/libcrypto/bio/bio_lcl.h b/src/lib/libcrypto/bio/bio_lcl.h
new file mode 100644
index 0000000000..e7f7ec8d8b
--- /dev/null
+++ b/src/lib/libcrypto/bio/bio_lcl.h
@@ -0,0 +1,36 @@
+#include <openssl/bio.h>
+
+#if BIO_FLAGS_UPLINK==0
+/* Shortcut UPLINK calls on most platforms... */
+#define UP_stdin        stdin
+#define UP_stdout       stdout
+#define UP_stderr       stderr
+#define UP_fprintf      fprintf
+#define UP_fgets        fgets
+#define UP_fread        fread
+#define UP_fwrite       fwrite
+#undef  UP_fsetmod
+#define UP_feof         feof
+#define UP_fclose       fclose
+
+#define UP_fopen        fopen
+#define UP_fseek        fseek
+#define UP_ftell        ftell
+#define UP_fflush       fflush
+#define UP_ferror       ferror
+#ifdef _WIN32
+#define UP_fileno       _fileno
+#define UP_open         _open
+#define UP_read         _read
+#define UP_write        _write
+#define UP_lseek        _lseek
+#define UP_close        _close
+#else
+#define UP_fileno       fileno
+#define UP_open         open
+#define UP_read         read
+#define UP_write        write
+#define UP_lseek        lseek
+#define UP_close        close
+#endif
+#endif
diff --git a/src/lib/libcrypto/bn/asm/alpha.s b/src/lib/libcrypto/bn/asm/alpha.s
deleted file mode 100644
index 555ff0b92d..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.s
+++ /dev/null
@@ -1,3199 +0,0 @@
- # DEC Alpha assember
- # The bn_div_words is actually gcc output but the other parts are hand done.
- # Thanks to tzeruch@ceddec.com for sending me the gcc output for
- # bn_div_words.
- # I've gone back and re-done most of routines.
- # The key thing to remeber for the 164 CPU is that while a
- # multiply operation takes 8 cycles, another one can only be issued
- # after 4 cycles have elapsed.  I've done modification to help
- # improve this.  Also, normally, a ld instruction will not be available
- # for about 3 cycles.
-        .file   1 "bn_asm.c"
-        .set noat
-gcc2_compiled.:
-__gnu_compiled_c:
-        .text
-        .align 3
-        .globl bn_mul_add_words
-        .ent bn_mul_add_words
-bn_mul_add_words:
-bn_mul_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$43         # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-        .align 3
-$42:
-        mulq    $20,$19,$5      # 1 2 1 ######
-        ldq     $21,8($17)      # 2 1
-        ldq     $2,8($16)       # 2 1
-        umulh   $20,$19,$20     # 1 2   ######
-        ldq     $27,16($17)     # 3 1
-        ldq     $3,16($16)      # 3 1
-        mulq    $21,$19,$6      # 2 2 1 ######
-         ldq    $28,24($17)     # 4 1
-        addq    $1,$5,$1        # 1 2 2
-         ldq    $4,24($16)      # 4 1
-        umulh   $21,$19,$21     # 2 2   ######
-         cmpult $1,$5,$22       # 1 2 3 1
-        addq    $20,$22,$20     # 1 3 1
-         addq   $1,$0,$1        # 1 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 ######
-         cmpult $1,$0,$0        # 1 2 3 2
-        addq    $2,$6,$2        # 2 2 2
-         addq   $20,$0,$0       # 1 3 2 
-        cmpult  $2,$6,$23       # 2 2 3 1
-         addq   $21,$23,$21     # 2 3 1
-        umulh   $27,$19,$27     # 3 2   ######
-         addq   $2,$0,$2        # 2 2 3 1
-        cmpult  $2,$0,$0        # 2 2 3 2
-         subq   $18,4,$18
-        mulq    $28,$19,$8      # 4 2 1 ######
-         addq   $21,$0,$0       # 2 3 2 
-        addq    $3,$7,$3        # 3 2 2
-         addq   $16,32,$16
-        cmpult  $3,$7,$24       # 3 2 3 1
-         stq    $1,-32($16)     # 1 2 4
-        umulh   $28,$19,$28     # 4 2   ######
-         addq   $27,$24,$27     # 3 3 1
-        addq    $3,$0,$3        # 3 2 3 1
-         stq    $2,-24($16)     # 2 2 4
-        cmpult  $3,$0,$0        # 3 2 3 2
-         stq    $3,-16($16)     # 3 2 4
-        addq    $4,$8,$4        # 4 2 2
-         addq   $27,$0,$0       # 3 3 2 
-        cmpult  $4,$8,$25       # 4 2 3 1
-         addq   $17,32,$17
-        addq    $28,$25,$28     # 4 3 1
-         addq   $4,$0,$4        # 4 2 3 1
-        cmpult  $4,$0,$0        # 4 2 3 2
-         stq    $4,-8($16)      # 4 2 4
-        addq    $28,$0,$0       # 4 3 2 
-         blt    $18,$43
-
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-
-        br      $42
-
-        .align 4
-$45:
-        ldq     $20,0($17)      # 4 1
-        ldq     $1,0($16)       # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        addq    $16,8,$16
-        addq    $17,8,$17
-        umulh   $20,$19,$20     # 4 2
-        addq    $1,$5,$1        # 4 2 2
-        cmpult  $1,$5,$22       # 4 2 3 1
-        addq    $20,$22,$20     # 4 3 1
-        addq    $1,$0,$1        # 4 2 3 1
-        cmpult  $1,$0,$0        # 4 2 3 2
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $1,-8($16)      # 4 2 4
-        bgt     $18,$45
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$43:
-        addq    $18,4,$18
-        bgt     $18,$45         # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_add_words
-        .align 3
-        .globl bn_mul_words
-        .ent bn_mul_words
-bn_mul_words:
-bn_mul_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$143        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$142:
-
-        mulq    $20,$19,$5      # 1 2 1 #####
-         ldq    $21,8($17)      # 2 1
-         ldq    $27,16($17)     # 3 1
-        umulh   $20,$19,$20     # 1 2   #####
-         ldq    $28,24($17)     # 4 1
-        mulq    $21,$19,$6      # 2 2 1 #####
-         addq   $5,$0,$5        # 1 2 3 1
-        subq    $18,4,$18
-         cmpult $5,$0,$0        # 1 2 3 2
-        umulh   $21,$19,$21     # 2 2   #####
-         addq   $20,$0,$0       # 1 3 2 
-        addq    $17,32,$17
-         addq   $6,$0,$6        # 2 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 #####
-         cmpult $6,$0,$0        # 2 2 3 2
-        addq    $21,$0,$0       # 2 3 2 
-         addq   $16,32,$16
-        umulh   $27,$19,$27     # 3 2   #####
-         stq    $5,-32($16)     # 1 2 4
-        mulq    $28,$19,$8      # 4 2 1 #####
-         addq   $7,$0,$7        # 3 2 3 1
-        stq     $6,-24($16)     # 2 2 4
-         cmpult $7,$0,$0        # 3 2 3 2
-        umulh   $28,$19,$28     # 4 2   #####
-         addq   $27,$0,$0       # 3 3 2 
-        stq     $7,-16($16)     # 3 2 4
-         addq   $8,$0,$8        # 4 2 3 1
-        cmpult  $8,$0,$0        # 4 2 3 2
-
-        addq    $28,$0,$0       # 4 3 2 
-
-        stq     $8,-8($16)      # 4 2 4
-
-        blt     $18,$143
-
-        ldq     $20,0($17)      # 1 1
-
-        br      $142
-
-        .align 4
-$145:
-        ldq     $20,0($17)      # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        umulh   $20,$19,$20     # 4 2
-        addq    $5,$0,$5        # 4 2 3 1
-         addq   $16,8,$16
-        cmpult  $5,$0,$0        # 4 2 3 2
-         addq   $17,8,$17
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $5,-8($16)      # 4 2 4
-
-        bgt     $18,$145
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$143:
-        addq    $18,4,$18
-        bgt     $18,$145        # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_words
-        .align 3
-        .globl bn_sqr_words
-        .ent bn_sqr_words
-bn_sqr_words:
-bn_sqr_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $18,4,$18
-        blt     $18,$543        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$542:
-        mulq    $20,$20,$5              ######
-         ldq    $21,8($17)      # 1 1
-        subq    $18,4
-        umulh   $20,$20,$1              ######
-        ldq     $27,16($17)     # 1 1
-        mulq    $21,$21,$6              ######
-        ldq     $28,24($17)     # 1 1
-        stq     $5,0($16)       # r[0]
-        umulh   $21,$21,$2              ######
-        stq     $1,8($16)       # r[1]
-        mulq    $27,$27,$7              ######
-        stq     $6,16($16)      # r[0]
-        umulh   $27,$27,$3              ######
-        stq     $2,24($16)      # r[1]
-        mulq    $28,$28,$8              ######
-        stq     $7,32($16)      # r[0]
-        umulh   $28,$28,$4              ######
-        stq     $3,40($16)      # r[1]
-
-        addq    $16,64,$16
-        addq    $17,32,$17
-        stq     $8,-16($16)     # r[0]
-        stq     $4,-8($16)      # r[1]
-
-        blt     $18,$543
-        ldq     $20,0($17)      # 1 1
-        br      $542
-
-$442:
-        ldq     $20,0($17)   # a[0]
-        mulq    $20,$20,$5  # a[0]*w low part       r2
-        addq    $16,16,$16
-        addq    $17,8,$17
-        subq    $18,1,$18
-        umulh   $20,$20,$1  # a[0]*w high part       r3
-        stq     $5,-16($16)   # r[0]
-        stq     $1,-8($16)   # r[1]
-
-        bgt     $18,$442
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$543:
-        addq    $18,4,$18
-        bgt     $18,$442        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sqr_words
-
-        .align 3
-        .globl bn_add_words
-        .ent bn_add_words
-bn_add_words:
-bn_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$0      # carry = 0
-        blt     $19,$900
-        ldq     $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-        .align 3
-$901:
-        addq    $1,$5,$1        # r=a+b;
-         ldq    $6,8($17)       # a[1]
-        cmpult  $1,$5,$22       # did we overflow?
-         ldq    $2,8($18)       # b[1]
-        addq    $1,$0,$1        # c+= overflow
-         ldq    $7,16($17)      # a[2]
-        cmpult  $1,$0,$0        # overflow?
-         ldq    $3,16($18)      # b[2]
-        addq    $0,$22,$0
-         ldq    $8,24($17)      # a[3]
-        addq    $2,$6,$2        # r=a+b;
-         ldq    $4,24($18)      # b[3]
-        cmpult  $2,$6,$23       # did we overflow?
-         addq   $3,$7,$3        # r=a+b;
-        addq    $2,$0,$2        # c+= overflow
-         cmpult $3,$7,$24       # did we overflow?
-        cmpult  $2,$0,$0        # overflow?
-         addq   $4,$8,$4        # r=a+b;
-        addq    $0,$23,$0
-         cmpult $4,$8,$25       # did we overflow?
-        addq    $3,$0,$3        # c+= overflow
-         stq    $1,0($16)       # r[0]=c
-        cmpult  $3,$0,$0        # overflow?
-         stq    $2,8($16)       # r[1]=c
-        addq    $0,$24,$0
-         stq    $3,16($16)      # r[2]=c
-        addq    $4,$0,$4        # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $4,$0,$0        # overflow?
-         addq   $17,32,$17      # a++
-        addq    $0,$25,$0
-         stq    $4,24($16)      # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$900
-         ldq    $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-         br     $901
-        .align 4
-$945:
-        ldq     $5,0($17)       # a[0]
-         ldq    $1,0($18)       # b[1]
-        addq    $1,$5,$1        # r=a+b;
-         subq   $19,1,$19       # loop--
-        addq    $1,$0,$1        # c+= overflow
-         addq   $17,8,$17       # a++
-        cmpult  $1,$5,$22       # did we overflow?
-         cmpult $1,$0,$0        # overflow?
-        addq    $18,8,$18       # b++
-         stq    $1,0($16)       # r[0]=c
-        addq    $0,$22,$0
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$945
-        ret     $31,($26),1     # else exit
-
-$900:
-        addq    $19,4,$19
-        bgt     $19,$945        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_add_words
-
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .align 3
-        .globl bn_div_words
-        .ent bn_div_words
-bn_div_words:
-        ldgp $29,0($27)
-bn_div_words..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$119
-        lda $0,-1
-        br $31,$136
-        .align 4
-$119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$126
-        zapnot $7,15,$27
-        br $31,$127
-        .align 4
-$126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$127:
-        srl $10,32,$4
-        .align 5
-$128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$129
-        subq $27,1,$27
-        br $31,$128
-        .align 4
-$129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$134
-        addq $9,$11,$9
-        subq $27,1,$27
-$134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$123
-        .align 4
-$124:
-        bis $13,$27,$0
-$136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div_words
-
-        .set noat
-        .text
-        .align 3
-        .globl bn_sub_words
-        .ent bn_sub_words
-bn_sub_words:
-bn_sub_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,    4,      $19
-        bis     $31,    $31,    $0
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-$101:
-        ldq     $3,     8($17)
-        cmpult  $1,     $2,     $4
-        ldq     $5,     8($18)
-        subq    $1,     $2,     $1
-        ldq     $6,     16($17)
-        cmpult  $1,     $0,     $2
-        ldq     $7,     16($18)
-        subq    $1,     $0,     $23
-        ldq     $8,     24($17)
-        addq    $2,     $4,     $0
-        cmpult  $3,     $5,     $24
-        subq    $3,     $5,     $3
-        ldq     $22,    24($18)
-        cmpult  $3,     $0,     $5
-        subq    $3,     $0,     $25
-        addq    $5,     $24,    $0
-        cmpult  $6,     $7,     $27
-        subq    $6,     $7,     $6
-        stq     $23,    0($16)
-        cmpult  $6,     $0,     $7
-        subq    $6,     $0,     $28
-        addq    $7,     $27,    $0
-        cmpult  $8,     $22,    $21
-        subq    $8,     $22,    $8
-        stq     $25,    8($16)
-        cmpult  $8,     $0,     $22
-        subq    $8,     $0,     $20
-        addq    $22,    $21,    $0
-        stq     $28,    16($16)
-        subq    $19,    4,      $19
-        stq     $20,    24($16)
-        addq    $17,    32,     $17
-        addq    $18,    32,     $18
-        addq    $16,    32,     $16
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        br      $101
-$102:
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        cmpult  $1,     $2,     $27
-        subq    $1,     $2,     $1
-        cmpult  $1,     $0,     $2
-        subq    $1,     $0,     $1
-        stq     $1,     0($16)
-        addq    $2,     $27,    $0
-        addq    $17,    8,      $17
-        addq    $18,    8,      $18
-        addq    $16,    8,      $16
-        subq    $19,    1,      $19
-        bgt     $19,    $102
-        ret     $31,($26),1
-$100:
-        addq    $19,    4,      $19
-        bgt     $19,    $102
-$103:
-        ret     $31,($26),1
-        .end bn_sub_words
-        .text
-        .align 3
-        .globl bn_mul_comba4
-        .ent bn_mul_comba4
-bn_mul_comba4:
-bn_mul_comba4..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        ldq     $0,     0($17)
-        ldq     $1,     0($18)
-        ldq     $2,     8($17)
-        ldq     $3,     8($18)
-        ldq     $4,     16($17)
-        ldq     $5,     16($18)
-        ldq     $6,     24($17)
-        ldq     $7,     24($18)
-        bis     $31,    $31,    $23
-        mulq    $0,     $1,     $8
-        umulh   $0,     $1,     $22
-        stq     $8,     0($16)
-        bis     $31,    $31,    $8
-        mulq    $0,     $3,     $24
-        umulh   $0,     $3,     $25
-        addq    $22,    $24,    $22
-        cmpult  $22,    $24,    $27
-        addq    $27,    $25,    $25
-        addq    $23,    $25,    $23
-        cmpult  $23,    $25,    $28
-        addq    $8,     $28,    $8
-        mulq    $2,     $1,     $21
-        umulh   $2,     $1,     $20
-        addq    $22,    $21,    $22
-        cmpult  $22,    $21,    $19
-        addq    $19,    $20,    $20
-        addq    $23,    $20,    $23
-        cmpult  $23,    $20,    $17
-        addq    $8,     $17,    $8
-        stq     $22,    8($16)
-        bis     $31,    $31,    $22
-        mulq    $2,     $3,     $18
-        umulh   $2,     $3,     $24
-        addq    $23,    $18,    $23
-        cmpult  $23,    $18,    $27
-        addq    $27,    $24,    $24
-        addq    $8,     $24,    $8
-        cmpult  $8,     $24,    $25
-        addq    $22,    $25,    $22
-        mulq    $0,     $5,     $28
-        umulh   $0,     $5,     $21
-        addq    $23,    $28,    $23
-        cmpult  $23,    $28,    $19
-        addq    $19,    $21,    $21
-        addq    $8,     $21,    $8
-        cmpult  $8,     $21,    $20
-        addq    $22,    $20,    $22
-        mulq    $4,     $1,     $17
-        umulh   $4,     $1,     $18
-        addq    $23,    $17,    $23
-        cmpult  $23,    $17,    $27
-        addq    $27,    $18,    $18
-        addq    $8,     $18,    $8
-        cmpult  $8,     $18,    $24
-        addq    $22,    $24,    $22
-        stq     $23,    16($16)
-        bis     $31,    $31,    $23
-        mulq    $0,     $7,     $25
-        umulh   $0,     $7,     $28
-        addq    $8,     $25,    $8
-        cmpult  $8,     $25,    $19
-        addq    $19,    $28,    $28
-        addq    $22,    $28,    $22
-        cmpult  $22,    $28,    $21
-        addq    $23,    $21,    $23
-        mulq    $2,     $5,     $20
-        umulh   $2,     $5,     $17
-        addq    $8,     $20,    $8
-        cmpult  $8,     $20,    $27
-        addq    $27,    $17,    $17
-        addq    $22,    $17,    $22
-        cmpult  $22,    $17,    $18
-        addq    $23,    $18,    $23
-        mulq    $4,     $3,     $24
-        umulh   $4,     $3,     $25
-        addq    $8,     $24,    $8
-        cmpult  $8,     $24,    $19
-        addq    $19,    $25,    $25
-        addq    $22,    $25,    $22
-        cmpult  $22,    $25,    $28
-        addq    $23,    $28,    $23
-        mulq    $6,     $1,     $21
-        umulh   $6,     $1,     $0
-        addq    $8,     $21,    $8
-        cmpult  $8,     $21,    $20
-        addq    $20,    $0,     $0
-        addq    $22,    $0,     $22
-        cmpult  $22,    $0,     $27
-        addq    $23,    $27,    $23
-        stq     $8,     24($16)
-        bis     $31,    $31,    $8
-        mulq    $2,     $7,     $17
-        umulh   $2,     $7,     $18
-        addq    $22,    $17,    $22
-        cmpult  $22,    $17,    $24
-        addq    $24,    $18,    $18
-        addq    $23,    $18,    $23
-        cmpult  $23,    $18,    $19
-        addq    $8,     $19,    $8
-        mulq    $4,     $5,     $25
-        umulh   $4,     $5,     $28
-        addq    $22,    $25,    $22
-        cmpult  $22,    $25,    $21
-        addq    $21,    $28,    $28
-        addq    $23,    $28,    $23
-        cmpult  $23,    $28,    $20
-        addq    $8,     $20,    $8
-        mulq    $6,     $3,     $0
-        umulh   $6,     $3,     $27
-        addq    $22,    $0,     $22
-        cmpult  $22,    $0,     $1
-        addq    $1,     $27,    $27
-        addq    $23,    $27,    $23
-        cmpult  $23,    $27,    $17
-        addq    $8,     $17,    $8
-        stq     $22,    32($16)
-        bis     $31,    $31,    $22
-        mulq    $4,     $7,     $24
-        umulh   $4,     $7,     $18
-        addq    $23,    $24,    $23
-        cmpult  $23,    $24,    $19
-        addq    $19,    $18,    $18
-        addq    $8,     $18,    $8
-        cmpult  $8,     $18,    $2
-        addq    $22,    $2,     $22
-        mulq    $6,     $5,     $25
-        umulh   $6,     $5,     $21
-        addq    $23,    $25,    $23
-        cmpult  $23,    $25,    $28
-        addq    $28,    $21,    $21
-        addq    $8,     $21,    $8
-        cmpult  $8,     $21,    $20
-        addq    $22,    $20,    $22
-        stq     $23,    40($16)
-        bis     $31,    $31,    $23
-        mulq    $6,     $7,     $0
-        umulh   $6,     $7,     $1
-        addq    $8,     $0,     $8
-        cmpult  $8,     $0,     $27
-        addq    $27,    $1,     $1
-        addq    $22,    $1,     $22
-        cmpult  $22,    $1,     $17
-        addq    $23,    $17,    $23
-        stq     $8,     48($16)
-        stq     $22,    56($16)
-        ret     $31,($26),1
-        .end bn_mul_comba4
-        .text
-        .align 3
-        .globl bn_mul_comba8
-        .ent bn_mul_comba8
-bn_mul_comba8:
-bn_mul_comba8..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        zapnot  $1,     15,     $7
-        srl     $2,     32,     $8
-        mulq    $8,     $7,     $22
-        srl     $1,     32,     $6
-        zapnot  $2,     15,     $5
-        mulq    $5,     $6,     $4
-        mulq    $7,     $5,     $24
-        addq    $22,    $4,     $22
-        cmpult  $22,    $4,     $1
-        mulq    $6,     $8,     $3
-        beq     $1,     $173
-        bis     $31,    1,      $1
-        sll     $1,     32,     $1
-        addq    $3,     $1,     $3
-$173:
-        sll     $22,    32,     $4
-        addq    $24,    $4,     $24
-        stq     $24,    0($16)
-        ldq     $2,     0($17)
-        ldq     $1,     8($18)
-        zapnot  $2,     15,     $7
-        srl     $1,     32,     $8
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $2,     32,     $6
-        mulq    $5,     $6,     $23
-        mulq    $6,     $8,     $6
-        srl     $22,    32,     $1
-        cmpult  $24,    $4,     $2
-        addq    $3,     $1,     $3
-        addq    $2,     $3,     $22
-        addq    $25,    $23,    $25
-        cmpult  $25,    $23,    $1
-        bis     $31,    1,      $2
-        beq     $1,     $177
-        sll     $2,     32,     $1
-        addq    $6,     $1,     $6
-$177:
-        sll     $25,    32,     $23
-        ldq     $1,     0($18)
-        addq    $0,     $23,    $0
-        bis     $0,     $0,     $7
-        ldq     $3,     8($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $4
-        zapnot  $3,     15,     $7
-        mulq    $8,     $7,     $28
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $25,    32,     $1
-        cmpult  $0,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $4,     $6,     $24
-        srl     $3,     32,     $6
-        mulq    $5,     $6,     $2
-        mulq    $6,     $8,     $6
-        addq    $28,    $2,     $28
-        cmpult  $28,    $2,     $1
-        bis     $31,    1,      $2
-        beq     $1,     $181
-        sll     $2,     32,     $1
-        addq    $6,     $1,     $6
-$181:
-        sll     $28,    32,     $2
-        addq    $21,    $2,     $21
-        bis     $21,    $21,    $7
-        addq    $22,    $7,     $22
-        stq     $22,    8($16)
-        ldq     $3,     16($17)
-        ldq     $1,     0($18)
-        cmpult  $22,    $7,     $4
-        zapnot  $3,     15,     $7
-        srl     $1,     32,     $8
-        mulq    $8,     $7,     $22
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $20
-        srl     $28,    32,     $1
-        cmpult  $21,    $2,     $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $4,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $3,     32,     $6
-        mulq    $5,     $6,     $2
-        mulq    $6,     $8,     $6
-        addq    $22,    $2,     $22
-        cmpult  $22,    $2,     $1
-        bis     $31,    1,      $2
-        beq     $1,     $185
-        sll     $2,     32,     $1
-        addq    $6,     $1,     $6
-$185:
-        sll     $22,    32,     $2
-        ldq     $1,     8($18)
-        addq    $20,    $2,     $20
-        bis     $20,    $20,    $7
-        ldq     $4,     8($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $22,    32,     $1
-        cmpult  $20,    $2,     $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $189
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$189:
-        sll     $25,    32,     $5
-        ldq     $2,     16($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     0($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $193
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$193:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    16($16)
-        ldq     $4,     0($17)
-        ldq     $5,     24($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $0,     $24,    $0
-        cmpult  $0,     $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $197
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$197:
-        sll     $0,     32,     $24
-        ldq     $1,     16($18)
-        addq    $2,     $24,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     8($17)
-        addq    $23,    $7,     $23
-        srl     $1,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $24,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $201
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$201:
-        sll     $25,    32,     $5
-        ldq     $2,     8($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     16($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $205
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$205:
-        sll     $28,    32,     $25
-        ldq     $2,     0($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $209
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$209:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    24($16)
-        ldq     $4,     32($17)
-        ldq     $5,     0($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $28,    $23,    $28
-        cmpult  $28,    $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $213
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$213:
-        sll     $28,    32,     $23
-        ldq     $1,     8($18)
-        addq    $2,     $23,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     24($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $217
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$217:
-        sll     $25,    32,     $5
-        ldq     $2,     16($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     16($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $221
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$221:
-        sll     $28,    32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     8($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $225
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$225:
-        sll     $0,     32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     0($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $229
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$229:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    32($16)
-        ldq     $4,     0($17)
-        ldq     $5,     40($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $0,     $22,    $0
-        cmpult  $0,     $22,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $233
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$233:
-        sll     $0,     32,     $22
-        ldq     $1,     32($18)
-        addq    $2,     $22,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     8($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $22,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $237
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$237:
-        sll     $25,    32,     $5
-        ldq     $2,     24($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     16($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $241
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$241:
-        sll     $28,    32,     $25
-        ldq     $2,     16($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $245
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$245:
-        sll     $0,     32,     $25
-        ldq     $2,     8($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $249
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$249:
-        sll     $28,    32,     $25
-        ldq     $2,     0($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $253
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$253:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    40($16)
-        ldq     $4,     48($17)
-        ldq     $5,     0($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $28,    $24,    $28
-        cmpult  $28,    $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $257
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$257:
-        sll     $28,    32,     $24
-        ldq     $1,     8($18)
-        addq    $2,     $24,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     40($17)
-        addq    $23,    $7,     $23
-        srl     $1,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $24,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $261
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$261:
-        sll     $25,    32,     $5
-        ldq     $2,     16($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     32($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $265
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$265:
-        sll     $28,    32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $269
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$269:
-        sll     $0,     32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     16($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $273
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$273:
-        sll     $28,    32,     $25
-        ldq     $2,     40($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     8($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $277
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$277:
-        sll     $0,     32,     $25
-        ldq     $2,     48($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     0($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $281
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$281:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    48($16)
-        ldq     $4,     0($17)
-        ldq     $5,     56($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $23,    $0
-        cmpult  $0,     $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $285
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$285:
-        sll     $0,     32,     $23
-        ldq     $1,     48($18)
-        addq    $2,     $23,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     8($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $289
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$289:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     16($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $293
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$293:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $297
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$297:
-        sll     $0,     32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $301
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$301:
-        sll     $28,    32,     $25
-        ldq     $2,     16($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $305
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$305:
-        sll     $0,     32,     $25
-        ldq     $2,     8($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     48($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $309
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$309:
-        sll     $28,    32,     $25
-        ldq     $2,     0($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $313
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$313:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    56($16)
-        ldq     $4,     56($17)
-        ldq     $5,     8($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $22,    $28
-        cmpult  $28,    $22,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $317
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$317:
-        sll     $28,    32,     $22
-        ldq     $1,     16($18)
-        addq    $2,     $22,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     48($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $22,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $321
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$321:
-        sll     $25,    32,     $5
-        ldq     $2,     24($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     40($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $325
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$325:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $329
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$329:
-        sll     $0,     32,     $25
-        ldq     $2,     40($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $333
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$333:
-        sll     $28,    32,     $25
-        ldq     $2,     48($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     16($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $337
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$337:
-        sll     $0,     32,     $25
-        ldq     $2,     56($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     8($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $341
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$341:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    64($16)
-        ldq     $4,     16($17)
-        ldq     $5,     56($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $0,     $24,    $0
-        cmpult  $0,     $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $345
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$345:
-        sll     $0,     32,     $24
-        ldq     $1,     48($18)
-        addq    $2,     $24,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     24($17)
-        addq    $23,    $7,     $23
-        srl     $1,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $24,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $349
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$349:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     32($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $353
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$353:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $357
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$357:
-        sll     $0,     32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     48($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $361
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$361:
-        sll     $28,    32,     $25
-        ldq     $2,     16($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $365
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$365:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    72($16)
-        ldq     $4,     56($17)
-        ldq     $5,     24($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $28,    $23,    $28
-        cmpult  $28,    $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $369
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$369:
-        sll     $28,    32,     $23
-        ldq     $1,     32($18)
-        addq    $2,     $23,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     48($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $373
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$373:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     40($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $377
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$377:
-        sll     $28,    32,     $25
-        ldq     $2,     48($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $381
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$381:
-        sll     $0,     32,     $25
-        ldq     $2,     56($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $385
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$385:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    80($16)
-        ldq     $4,     32($17)
-        ldq     $5,     56($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $0,     $22,    $0
-        cmpult  $0,     $22,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $389
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$389:
-        sll     $0,     32,     $22
-        ldq     $1,     48($18)
-        addq    $2,     $22,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     40($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $22,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $393
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$393:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     48($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $397
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$397:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $21
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $21,    $25,    $21
-        cmpult  $21,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $401
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$401:
-        sll     $21,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    88($16)
-        ldq     $4,     56($17)
-        ldq     $5,     40($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $21,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $24,    $0
-        cmpult  $0,     $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $405
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$405:
-        sll     $0,     32,     $24
-        ldq     $2,     48($18)
-        addq    $5,     $24,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     48($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $24,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $409
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$409:
-        sll     $28,    32,     $25
-        ldq     $2,     56($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $413
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$413:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    96($16)
-        ldq     $4,     48($17)
-        ldq     $5,     56($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $23,    $28
-        cmpult  $28,    $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $417
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$417:
-        sll     $28,    32,     $23
-        ldq     $2,     48($18)
-        addq    $5,     $23,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $23,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $421
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$421:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    104($16)
-        ldq     $4,     56($17)
-        ldq     $5,     56($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $22,    $28
-        cmpult  $28,    $22,    $1
-        mulq    $6,     $8,     $3
-        beq     $1,     $425
-        sll     $20,    32,     $1
-        addq    $3,     $1,     $3
-$425:
-        sll     $28,    32,     $22
-        srl     $28,    32,     $1
-        addq    $2,     $22,    $2
-        addq    $3,     $1,     $3
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        cmpult  $7,     $22,    $1
-        cmpult  $24,    $7,     $2
-        addq    $1,     $3,     $6
-        addq    $2,     $6,     $6
-        stq     $24,    112($16)
-        addq    $23,    $6,     $23
-        stq     $23,    120($16)
-        ret     $31,    ($26),  1
-        .end bn_mul_comba8
-        .text
-        .align 3
-        .globl bn_sqr_comba4
-        .ent bn_sqr_comba4
-bn_sqr_comba4:
-bn_sqr_comba4..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        ldq     $0,     0($17)
-        ldq     $1,     8($17)
-        ldq     $2,     16($17)
-        ldq     $3,     24($17)
-        bis     $31,    $31,    $6
-        mulq    $0,     $0,     $4
-        umulh   $0,     $0,     $5
-        stq     $4,     0($16)
-        bis     $31,    $31,    $4
-        mulq    $0,     $1,     $7
-        umulh   $0,     $1,     $8
-        cmplt   $7,     $31,    $22
-        cmplt   $8,     $31,    $23
-        addq    $7,     $7,     $7
-        addq    $8,     $8,     $8
-        addq    $8,     $22,    $8
-        addq    $4,     $23,    $4
-        addq    $5,     $7,     $5
-        addq    $6,     $8,     $6
-        cmpult  $5,     $7,     $24
-        cmpult  $6,     $8,     $25
-        addq    $6,     $24,    $6
-        addq    $4,     $25,    $4
-        stq     $5,     8($16)
-        bis     $31,    $31,    $5
-        mulq    $1,     $1,     $27
-        umulh   $1,     $1,     $28
-        addq    $6,     $27,    $6
-        addq    $4,     $28,    $4
-        cmpult  $6,     $27,    $21
-        cmpult  $4,     $28,    $20
-        addq    $4,     $21,    $4
-        addq    $5,     $20,    $5
-        mulq    $2,     $0,     $19
-        umulh   $2,     $0,     $18
-        cmplt   $19,    $31,    $17
-        cmplt   $18,    $31,    $22
-        addq    $19,    $19,    $19
-        addq    $18,    $18,    $18
-        addq    $18,    $17,    $18
-        addq    $5,     $22,    $5
-        addq    $6,     $19,    $6
-        addq    $4,     $18,    $4
-        cmpult  $6,     $19,    $23
-        cmpult  $4,     $18,    $7
-        addq    $4,     $23,    $4
-        addq    $5,     $7,     $5
-        stq     $6,     16($16)
-        bis     $31,    $31,    $6
-        mulq    $3,     $0,     $8
-        umulh   $3,     $0,     $24
-        cmplt   $8,     $31,    $25
-        cmplt   $24,    $31,    $27
-        addq    $8,     $8,     $8
-        addq    $24,    $24,    $24
-        addq    $24,    $25,    $24
-        addq    $6,     $27,    $6
-        addq    $4,     $8,     $4
-        addq    $5,     $24,    $5
-        cmpult  $4,     $8,     $28
-        cmpult  $5,     $24,    $21
-        addq    $5,     $28,    $5
-        addq    $6,     $21,    $6
-        mulq    $2,     $1,     $20
-        umulh   $2,     $1,     $17
-        cmplt   $20,    $31,    $22
-        cmplt   $17,    $31,    $19
-        addq    $20,    $20,    $20
-        addq    $17,    $17,    $17
-        addq    $17,    $22,    $17
-        addq    $6,     $19,    $6
-        addq    $4,     $20,    $4
-        addq    $5,     $17,    $5
-        cmpult  $4,     $20,    $18
-        cmpult  $5,     $17,    $23
-        addq    $5,     $18,    $5
-        addq    $6,     $23,    $6
-        stq     $4,     24($16)
-        bis     $31,    $31,    $4
-        mulq    $2,     $2,     $7
-        umulh   $2,     $2,     $25
-        addq    $5,     $7,     $5
-        addq    $6,     $25,    $6
-        cmpult  $5,     $7,     $27
-        cmpult  $6,     $25,    $8
-        addq    $6,     $27,    $6
-        addq    $4,     $8,     $4
-        mulq    $3,     $1,     $24
-        umulh   $3,     $1,     $28
-        cmplt   $24,    $31,    $21
-        cmplt   $28,    $31,    $22
-        addq    $24,    $24,    $24
-        addq    $28,    $28,    $28
-        addq    $28,    $21,    $28
-        addq    $4,     $22,    $4
-        addq    $5,     $24,    $5
-        addq    $6,     $28,    $6
-        cmpult  $5,     $24,    $19
-        cmpult  $6,     $28,    $20
-        addq    $6,     $19,    $6
-        addq    $4,     $20,    $4
-        stq     $5,     32($16)
-        bis     $31,    $31,    $5
-        mulq    $3,     $2,     $17
-        umulh   $3,     $2,     $18
-        cmplt   $17,    $31,    $23
-        cmplt   $18,    $31,    $7
-        addq    $17,    $17,    $17
-        addq    $18,    $18,    $18
-        addq    $18,    $23,    $18
-        addq    $5,     $7,     $5
-        addq    $6,     $17,    $6
-        addq    $4,     $18,    $4
-        cmpult  $6,     $17,    $25
-        cmpult  $4,     $18,    $27
-        addq    $4,     $25,    $4
-        addq    $5,     $27,    $5
-        stq     $6,     40($16)
-        bis     $31,    $31,    $6
-        mulq    $3,     $3,     $8
-        umulh   $3,     $3,     $21
-        addq    $4,     $8,     $4
-        addq    $5,     $21,    $5
-        cmpult  $4,     $8,     $22
-        cmpult  $5,     $21,    $24
-        addq    $5,     $22,    $5
-        addq    $6,     $24,    $6
-        stq     $4,     48($16)
-        stq     $5,     56($16)
-        ret     $31,($26),1
-        .end bn_sqr_comba4
-        .text
-        .align 3
-        .globl bn_sqr_comba8
-        .ent bn_sqr_comba8
-bn_sqr_comba8:
-bn_sqr_comba8..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        ldq     $0,     0($17)
-        ldq     $1,     8($17)
-        ldq     $2,     16($17)
-        ldq     $3,     24($17)
-        ldq     $4,     32($17)
-        ldq     $5,     40($17)
-        ldq     $6,     48($17)
-        ldq     $7,     56($17)
-        bis     $31,    $31,    $23
-        mulq    $0,     $0,     $8
-        umulh   $0,     $0,     $22
-        stq     $8,     0($16)
-        bis     $31,    $31,    $8
-        mulq    $1,     $0,     $24
-        umulh   $1,     $0,     $25
-        cmplt   $24,    $31,    $27
-        cmplt   $25,    $31,    $28
-        addq    $24,    $24,    $24
-        addq    $25,    $25,    $25
-        addq    $25,    $27,    $25
-        addq    $8,     $28,    $8
-        addq    $22,    $24,    $22
-        addq    $23,    $25,    $23
-        cmpult  $22,    $24,    $21
-        cmpult  $23,    $25,    $20
-        addq    $23,    $21,    $23
-        addq    $8,     $20,    $8
-        stq     $22,    8($16)
-        bis     $31,    $31,    $22
-        mulq    $1,     $1,     $19
-        umulh   $1,     $1,     $18
-        addq    $23,    $19,    $23
-        addq    $8,     $18,    $8
-        cmpult  $23,    $19,    $17
-        cmpult  $8,     $18,    $27
-        addq    $8,     $17,    $8
-        addq    $22,    $27,    $22
-        mulq    $2,     $0,     $28
-        umulh   $2,     $0,     $24
-        cmplt   $28,    $31,    $25
-        cmplt   $24,    $31,    $21
-        addq    $28,    $28,    $28
-        addq    $24,    $24,    $24
-        addq    $24,    $25,    $24
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        addq    $8,     $24,    $8
-        cmpult  $23,    $28,    $20
-        cmpult  $8,     $24,    $19
-        addq    $8,     $20,    $8
-        addq    $22,    $19,    $22
-        stq     $23,    16($16)
-        bis     $31,    $31,    $23
-        mulq    $2,     $1,     $18
-        umulh   $2,     $1,     $17
-        cmplt   $18,    $31,    $27
-        cmplt   $17,    $31,    $25
-        addq    $18,    $18,    $18
-        addq    $17,    $17,    $17
-        addq    $17,    $27,    $17
-        addq    $23,    $25,    $23
-        addq    $8,     $18,    $8
-        addq    $22,    $17,    $22
-        cmpult  $8,     $18,    $21
-        cmpult  $22,    $17,    $28
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        mulq    $3,     $0,     $24
-        umulh   $3,     $0,     $20
-        cmplt   $24,    $31,    $19
-        cmplt   $20,    $31,    $27
-        addq    $24,    $24,    $24
-        addq    $20,    $20,    $20
-        addq    $20,    $19,    $20
-        addq    $23,    $27,    $23
-        addq    $8,     $24,    $8
-        addq    $22,    $20,    $22
-        cmpult  $8,     $24,    $25
-        cmpult  $22,    $20,    $18
-        addq    $22,    $25,    $22
-        addq    $23,    $18,    $23
-        stq     $8,     24($16)
-        bis     $31,    $31,    $8
-        mulq    $2,     $2,     $17
-        umulh   $2,     $2,     $21
-        addq    $22,    $17,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $17,    $28
-        cmpult  $23,    $21,    $19
-        addq    $23,    $28,    $23
-        addq    $8,     $19,    $8
-        mulq    $3,     $1,     $27
-        umulh   $3,     $1,     $24
-        cmplt   $27,    $31,    $20
-        cmplt   $24,    $31,    $25
-        addq    $27,    $27,    $27
-        addq    $24,    $24,    $24
-        addq    $24,    $20,    $24
-        addq    $8,     $25,    $8
-        addq    $22,    $27,    $22
-        addq    $23,    $24,    $23
-        cmpult  $22,    $27,    $18
-        cmpult  $23,    $24,    $17
-        addq    $23,    $18,    $23
-        addq    $8,     $17,    $8
-        mulq    $4,     $0,     $21
-        umulh   $4,     $0,     $28
-        cmplt   $21,    $31,    $19
-        cmplt   $28,    $31,    $20
-        addq    $21,    $21,    $21
-        addq    $28,    $28,    $28
-        addq    $28,    $19,    $28
-        addq    $8,     $20,    $8
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        cmpult  $22,    $21,    $25
-        cmpult  $23,    $28,    $27
-        addq    $23,    $25,    $23
-        addq    $8,     $27,    $8
-        stq     $22,    32($16)
-        bis     $31,    $31,    $22
-        mulq    $3,     $2,     $24
-        umulh   $3,     $2,     $18
-        cmplt   $24,    $31,    $17
-        cmplt   $18,    $31,    $19
-        addq    $24,    $24,    $24
-        addq    $18,    $18,    $18
-        addq    $18,    $17,    $18
-        addq    $22,    $19,    $22
-        addq    $23,    $24,    $23
-        addq    $8,     $18,    $8
-        cmpult  $23,    $24,    $20
-        cmpult  $8,     $18,    $21
-        addq    $8,     $20,    $8
-        addq    $22,    $21,    $22
-        mulq    $4,     $1,     $28
-        umulh   $4,     $1,     $25
-        cmplt   $28,    $31,    $27
-        cmplt   $25,    $31,    $17
-        addq    $28,    $28,    $28
-        addq    $25,    $25,    $25
-        addq    $25,    $27,    $25
-        addq    $22,    $17,    $22
-        addq    $23,    $28,    $23
-        addq    $8,     $25,    $8
-        cmpult  $23,    $28,    $19
-        cmpult  $8,     $25,    $24
-        addq    $8,     $19,    $8
-        addq    $22,    $24,    $22
-        mulq    $5,     $0,     $18
-        umulh   $5,     $0,     $20
-        cmplt   $18,    $31,    $21
-        cmplt   $20,    $31,    $27
-        addq    $18,    $18,    $18
-        addq    $20,    $20,    $20
-        addq    $20,    $21,    $20
-        addq    $22,    $27,    $22
-        addq    $23,    $18,    $23
-        addq    $8,     $20,    $8
-        cmpult  $23,    $18,    $17
-        cmpult  $8,     $20,    $28
-        addq    $8,     $17,    $8
-        addq    $22,    $28,    $22
-        stq     $23,    40($16)
-        bis     $31,    $31,    $23
-        mulq    $3,     $3,     $25
-        umulh   $3,     $3,     $19
-        addq    $8,     $25,    $8
-        addq    $22,    $19,    $22
-        cmpult  $8,     $25,    $24
-        cmpult  $22,    $19,    $21
-        addq    $22,    $24,    $22
-        addq    $23,    $21,    $23
-        mulq    $4,     $2,     $27
-        umulh   $4,     $2,     $18
-        cmplt   $27,    $31,    $20
-        cmplt   $18,    $31,    $17
-        addq    $27,    $27,    $27
-        addq    $18,    $18,    $18
-        addq    $18,    $20,    $18
-        addq    $23,    $17,    $23
-        addq    $8,     $27,    $8
-        addq    $22,    $18,    $22
-        cmpult  $8,     $27,    $28
-        cmpult  $22,    $18,    $25
-        addq    $22,    $28,    $22
-        addq    $23,    $25,    $23
-        mulq    $5,     $1,     $19
-        umulh   $5,     $1,     $24
-        cmplt   $19,    $31,    $21
-        cmplt   $24,    $31,    $20
-        addq    $19,    $19,    $19
-        addq    $24,    $24,    $24
-        addq    $24,    $21,    $24
-        addq    $23,    $20,    $23
-        addq    $8,     $19,    $8
-        addq    $22,    $24,    $22
-        cmpult  $8,     $19,    $17
-        cmpult  $22,    $24,    $27
-        addq    $22,    $17,    $22
-        addq    $23,    $27,    $23
-        mulq    $6,     $0,     $18
-        umulh   $6,     $0,     $28
-        cmplt   $18,    $31,    $25
-        cmplt   $28,    $31,    $21
-        addq    $18,    $18,    $18
-        addq    $28,    $28,    $28
-        addq    $28,    $25,    $28
-        addq    $23,    $21,    $23
-        addq    $8,     $18,    $8
-        addq    $22,    $28,    $22
-        cmpult  $8,     $18,    $20
-        cmpult  $22,    $28,    $19
-        addq    $22,    $20,    $22
-        addq    $23,    $19,    $23
-        stq     $8,     48($16)
-        bis     $31,    $31,    $8
-        mulq    $4,     $3,     $24
-        umulh   $4,     $3,     $17
-        cmplt   $24,    $31,    $27
-        cmplt   $17,    $31,    $25
-        addq    $24,    $24,    $24
-        addq    $17,    $17,    $17
-        addq    $17,    $27,    $17
-        addq    $8,     $25,    $8
-        addq    $22,    $24,    $22
-        addq    $23,    $17,    $23
-        cmpult  $22,    $24,    $21
-        cmpult  $23,    $17,    $18
-        addq    $23,    $21,    $23
-        addq    $8,     $18,    $8
-        mulq    $5,     $2,     $28
-        umulh   $5,     $2,     $20
-        cmplt   $28,    $31,    $19
-        cmplt   $20,    $31,    $27
-        addq    $28,    $28,    $28
-        addq    $20,    $20,    $20
-        addq    $20,    $19,    $20
-        addq    $8,     $27,    $8
-        addq    $22,    $28,    $22
-        addq    $23,    $20,    $23
-        cmpult  $22,    $28,    $25
-        cmpult  $23,    $20,    $24
-        addq    $23,    $25,    $23
-        addq    $8,     $24,    $8
-        mulq    $6,     $1,     $17
-        umulh   $6,     $1,     $21
-        cmplt   $17,    $31,    $18
-        cmplt   $21,    $31,    $19
-        addq    $17,    $17,    $17
-        addq    $21,    $21,    $21
-        addq    $21,    $18,    $21
-        addq    $8,     $19,    $8
-        addq    $22,    $17,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $17,    $27
-        cmpult  $23,    $21,    $28
-        addq    $23,    $27,    $23
-        addq    $8,     $28,    $8
-        mulq    $7,     $0,     $20
-        umulh   $7,     $0,     $25
-        cmplt   $20,    $31,    $24
-        cmplt   $25,    $31,    $18
-        addq    $20,    $20,    $20
-        addq    $25,    $25,    $25
-        addq    $25,    $24,    $25
-        addq    $8,     $18,    $8
-        addq    $22,    $20,    $22
-        addq    $23,    $25,    $23
-        cmpult  $22,    $20,    $19
-        cmpult  $23,    $25,    $17
-        addq    $23,    $19,    $23
-        addq    $8,     $17,    $8
-        stq     $22,    56($16)
-        bis     $31,    $31,    $22
-        mulq    $4,     $4,     $21
-        umulh   $4,     $4,     $27
-        addq    $23,    $21,    $23
-        addq    $8,     $27,    $8
-        cmpult  $23,    $21,    $28
-        cmpult  $8,     $27,    $24
-        addq    $8,     $28,    $8
-        addq    $22,    $24,    $22
-        mulq    $5,     $3,     $18
-        umulh   $5,     $3,     $20
-        cmplt   $18,    $31,    $25
-        cmplt   $20,    $31,    $19
-        addq    $18,    $18,    $18
-        addq    $20,    $20,    $20
-        addq    $20,    $25,    $20
-        addq    $22,    $19,    $22
-        addq    $23,    $18,    $23
-        addq    $8,     $20,    $8
-        cmpult  $23,    $18,    $17
-        cmpult  $8,     $20,    $21
-        addq    $8,     $17,    $8
-        addq    $22,    $21,    $22
-        mulq    $6,     $2,     $27
-        umulh   $6,     $2,     $28
-        cmplt   $27,    $31,    $24
-        cmplt   $28,    $31,    $25
-        addq    $27,    $27,    $27
-        addq    $28,    $28,    $28
-        addq    $28,    $24,    $28
-        addq    $22,    $25,    $22
-        addq    $23,    $27,    $23
-        addq    $8,     $28,    $8
-        cmpult  $23,    $27,    $19
-        cmpult  $8,     $28,    $18
-        addq    $8,     $19,    $8
-        addq    $22,    $18,    $22
-        mulq    $7,     $1,     $20
-        umulh   $7,     $1,     $17
-        cmplt   $20,    $31,    $21
-        cmplt   $17,    $31,    $24
-        addq    $20,    $20,    $20
-        addq    $17,    $17,    $17
-        addq    $17,    $21,    $17
-        addq    $22,    $24,    $22
-        addq    $23,    $20,    $23
-        addq    $8,     $17,    $8
-        cmpult  $23,    $20,    $25
-        cmpult  $8,     $17,    $27
-        addq    $8,     $25,    $8
-        addq    $22,    $27,    $22
-        stq     $23,    64($16)
-        bis     $31,    $31,    $23
-        mulq    $5,     $4,     $28
-        umulh   $5,     $4,     $19
-        cmplt   $28,    $31,    $18
-        cmplt   $19,    $31,    $21
-        addq    $28,    $28,    $28
-        addq    $19,    $19,    $19
-        addq    $19,    $18,    $19
-        addq    $23,    $21,    $23
-        addq    $8,     $28,    $8
-        addq    $22,    $19,    $22
-        cmpult  $8,     $28,    $24
-        cmpult  $22,    $19,    $20
-        addq    $22,    $24,    $22
-        addq    $23,    $20,    $23
-        mulq    $6,     $3,     $17
-        umulh   $6,     $3,     $25
-        cmplt   $17,    $31,    $27
-        cmplt   $25,    $31,    $18
-        addq    $17,    $17,    $17
-        addq    $25,    $25,    $25
-        addq    $25,    $27,    $25
-        addq    $23,    $18,    $23
-        addq    $8,     $17,    $8
-        addq    $22,    $25,    $22
-        cmpult  $8,     $17,    $21
-        cmpult  $22,    $25,    $28
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        mulq    $7,     $2,     $19
-        umulh   $7,     $2,     $24
-        cmplt   $19,    $31,    $20
-        cmplt   $24,    $31,    $27
-        addq    $19,    $19,    $19
-        addq    $24,    $24,    $24
-        addq    $24,    $20,    $24
-        addq    $23,    $27,    $23
-        addq    $8,     $19,    $8
-        addq    $22,    $24,    $22
-        cmpult  $8,     $19,    $18
-        cmpult  $22,    $24,    $17
-        addq    $22,    $18,    $22
-        addq    $23,    $17,    $23
-        stq     $8,     72($16)
-        bis     $31,    $31,    $8
-        mulq    $5,     $5,     $25
-        umulh   $5,     $5,     $21
-        addq    $22,    $25,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $25,    $28
-        cmpult  $23,    $21,    $20
-        addq    $23,    $28,    $23
-        addq    $8,     $20,    $8
-        mulq    $6,     $4,     $27
-        umulh   $6,     $4,     $19
-        cmplt   $27,    $31,    $24
-        cmplt   $19,    $31,    $18
-        addq    $27,    $27,    $27
-        addq    $19,    $19,    $19
-        addq    $19,    $24,    $19
-        addq    $8,     $18,    $8
-        addq    $22,    $27,    $22
-        addq    $23,    $19,    $23
-        cmpult  $22,    $27,    $17
-        cmpult  $23,    $19,    $25
-        addq    $23,    $17,    $23
-        addq    $8,     $25,    $8
-        mulq    $7,     $3,     $21
-        umulh   $7,     $3,     $28
-        cmplt   $21,    $31,    $20
-        cmplt   $28,    $31,    $24
-        addq    $21,    $21,    $21
-        addq    $28,    $28,    $28
-        addq    $28,    $20,    $28
-        addq    $8,     $24,    $8
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        cmpult  $22,    $21,    $18
-        cmpult  $23,    $28,    $27
-        addq    $23,    $18,    $23
-        addq    $8,     $27,    $8
-        stq     $22,    80($16)
-        bis     $31,    $31,    $22
-        mulq    $6,     $5,     $19
-        umulh   $6,     $5,     $17
-        cmplt   $19,    $31,    $25
-        cmplt   $17,    $31,    $20
-        addq    $19,    $19,    $19
-        addq    $17,    $17,    $17
-        addq    $17,    $25,    $17
-        addq    $22,    $20,    $22
-        addq    $23,    $19,    $23
-        addq    $8,     $17,    $8
-        cmpult  $23,    $19,    $24
-        cmpult  $8,     $17,    $21
-        addq    $8,     $24,    $8
-        addq    $22,    $21,    $22
-        mulq    $7,     $4,     $28
-        umulh   $7,     $4,     $18
-        cmplt   $28,    $31,    $27
-        cmplt   $18,    $31,    $25
-        addq    $28,    $28,    $28
-        addq    $18,    $18,    $18
-        addq    $18,    $27,    $18
-        addq    $22,    $25,    $22
-        addq    $23,    $28,    $23
-        addq    $8,     $18,    $8
-        cmpult  $23,    $28,    $20
-        cmpult  $8,     $18,    $19
-        addq    $8,     $20,    $8
-        addq    $22,    $19,    $22
-        stq     $23,    88($16)
-        bis     $31,    $31,    $23
-        mulq    $6,     $6,     $17
-        umulh   $6,     $6,     $24
-        addq    $8,     $17,    $8
-        addq    $22,    $24,    $22
-        cmpult  $8,     $17,    $21
-        cmpult  $22,    $24,    $27
-        addq    $22,    $21,    $22
-        addq    $23,    $27,    $23
-        mulq    $7,     $5,     $25
-        umulh   $7,     $5,     $28
-        cmplt   $25,    $31,    $18
-        cmplt   $28,    $31,    $20
-        addq    $25,    $25,    $25
-        addq    $28,    $28,    $28
-        addq    $28,    $18,    $28
-        addq    $23,    $20,    $23
-        addq    $8,     $25,    $8
-        addq    $22,    $28,    $22
-        cmpult  $8,     $25,    $19
-        cmpult  $22,    $28,    $17
-        addq    $22,    $19,    $22
-        addq    $23,    $17,    $23
-        stq     $8,     96($16)
-        bis     $31,    $31,    $8
-        mulq    $7,     $6,     $24
-        umulh   $7,     $6,     $21
-        cmplt   $24,    $31,    $27
-        cmplt   $21,    $31,    $18
-        addq    $24,    $24,    $24
-        addq    $21,    $21,    $21
-        addq    $21,    $27,    $21
-        addq    $8,     $18,    $8
-        addq    $22,    $24,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $24,    $20
-        cmpult  $23,    $21,    $25
-        addq    $23,    $20,    $23
-        addq    $8,     $25,    $8
-        stq     $22,    104($16)
-        bis     $31,    $31,    $22
-        mulq    $7,     $7,     $28
-        umulh   $7,     $7,     $19
-        addq    $23,    $28,    $23
-        addq    $8,     $19,    $8
-        cmpult  $23,    $28,    $17
-        cmpult  $8,     $19,    $27
-        addq    $8,     $17,    $8
-        addq    $22,    $27,    $22
-        stq     $23,    112($16)
-        stq     $8,     120($16)
-        ret     $31,($26),1
-        .end bn_sqr_comba8
diff --git a/src/lib/libcrypto/bn/asm/alpha.s.works b/src/lib/libcrypto/bn/asm/alpha.s.works
deleted file mode 100644
index ee6c587809..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.s.works
+++ /dev/null
@@ -1,533 +0,0 @@
-
- # DEC Alpha assember
- # The bn_div64 is actually gcc output but the other parts are hand done.
- # Thanks to tzeruch@ceddec.com for sending me the gcc output for
- # bn_div64.
- # I've gone back and re-done most of routines.
- # The key thing to remeber for the 164 CPU is that while a
- # multiply operation takes 8 cycles, another one can only be issued
- # after 4 cycles have elapsed.  I've done modification to help
- # improve this.  Also, normally, a ld instruction will not be available
- # for about 3 cycles.
-        .file   1 "bn_asm.c"
-        .set noat
-gcc2_compiled.:
-__gnu_compiled_c:
-        .text
-        .align 3
-        .globl bn_mul_add_words
-        .ent bn_mul_add_words
-bn_mul_add_words:
-bn_mul_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$43         # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-        .align 3
-$42:
-        mulq    $20,$19,$5      # 1 2 1 ######
-        ldq     $21,8($17)      # 2 1
-        ldq     $2,8($16)       # 2 1
-        umulh   $20,$19,$20     # 1 2   ######
-        ldq     $27,16($17)     # 3 1
-        ldq     $3,16($16)      # 3 1
-        mulq    $21,$19,$6      # 2 2 1 ######
-         ldq    $28,24($17)     # 4 1
-        addq    $1,$5,$1        # 1 2 2
-         ldq    $4,24($16)      # 4 1
-        umulh   $21,$19,$21     # 2 2   ######
-         cmpult $1,$5,$22       # 1 2 3 1
-        addq    $20,$22,$20     # 1 3 1
-         addq   $1,$0,$1        # 1 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 ######
-         cmpult $1,$0,$0        # 1 2 3 2
-        addq    $2,$6,$2        # 2 2 2
-         addq   $20,$0,$0       # 1 3 2 
-        cmpult  $2,$6,$23       # 2 2 3 1
-         addq   $21,$23,$21     # 2 3 1
-        umulh   $27,$19,$27     # 3 2   ######
-         addq   $2,$0,$2        # 2 2 3 1
-        cmpult  $2,$0,$0        # 2 2 3 2
-         subq   $18,4,$18
-        mulq    $28,$19,$8      # 4 2 1 ######
-         addq   $21,$0,$0       # 2 3 2 
-        addq    $3,$7,$3        # 3 2 2
-         addq   $16,32,$16
-        cmpult  $3,$7,$24       # 3 2 3 1
-         stq    $1,-32($16)     # 1 2 4
-        umulh   $28,$19,$28     # 4 2   ######
-         addq   $27,$24,$27     # 3 3 1
-        addq    $3,$0,$3        # 3 2 3 1
-         stq    $2,-24($16)     # 2 2 4
-        cmpult  $3,$0,$0        # 3 2 3 2
-         stq    $3,-16($16)     # 3 2 4
-        addq    $4,$8,$4        # 4 2 2
-         addq   $27,$0,$0       # 3 3 2 
-        cmpult  $4,$8,$25       # 4 2 3 1
-         addq   $17,32,$17
-        addq    $28,$25,$28     # 4 3 1
-         addq   $4,$0,$4        # 4 2 3 1
-        cmpult  $4,$0,$0        # 4 2 3 2
-         stq    $4,-8($16)      # 4 2 4
-        addq    $28,$0,$0       # 4 3 2 
-         blt    $18,$43
-
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-
-        br      $42
-
-        .align 4
-$45:
-        ldq     $20,0($17)      # 4 1
-        ldq     $1,0($16)       # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        addq    $16,8,$16
-        addq    $17,8,$17
-        umulh   $20,$19,$20     # 4 2
-        addq    $1,$5,$1        # 4 2 2
-        cmpult  $1,$5,$22       # 4 2 3 1
-        addq    $20,$22,$20     # 4 3 1
-        addq    $1,$0,$1        # 4 2 3 1
-        cmpult  $1,$0,$0        # 4 2 3 2
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $1,-8($16)      # 4 2 4
-        bgt     $18,$45
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$43:
-        addq    $18,4,$18
-        bgt     $18,$45         # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_add_words
-        .align 3
-        .globl bn_mul_words
-        .ent bn_mul_words
-bn_mul_words:
-bn_mul_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$143        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$142:
-
-        mulq    $20,$19,$5      # 1 2 1 #####
-         ldq    $21,8($17)      # 2 1
-         ldq    $27,16($17)     # 3 1
-        umulh   $20,$19,$20     # 1 2   #####
-         ldq    $28,24($17)     # 4 1
-        mulq    $21,$19,$6      # 2 2 1 #####
-         addq   $5,$0,$5        # 1 2 3 1
-        subq    $18,4,$18
-         cmpult $5,$0,$0        # 1 2 3 2
-        umulh   $21,$19,$21     # 2 2   #####
-         addq   $20,$0,$0       # 1 3 2 
-        addq    $17,32,$17
-         addq   $6,$0,$6        # 2 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 #####
-         cmpult $6,$0,$0        # 2 2 3 2
-        addq    $21,$0,$0       # 2 3 2 
-         addq   $16,32,$16
-        umulh   $27,$19,$27     # 3 2   #####
-         stq    $5,-32($16)     # 1 2 4
-        mulq    $28,$19,$8      # 4 2 1 #####
-         addq   $7,$0,$7        # 3 2 3 1
-        stq     $6,-24($16)     # 2 2 4
-         cmpult $7,$0,$0        # 3 2 3 2
-        umulh   $28,$19,$28     # 4 2   #####
-         addq   $27,$0,$0       # 3 3 2 
-        stq     $7,-16($16)     # 3 2 4
-         addq   $8,$0,$8        # 4 2 3 1
-        cmpult  $8,$0,$0        # 4 2 3 2
-
-        addq    $28,$0,$0       # 4 3 2 
-
-        stq     $8,-8($16)      # 4 2 4
-
-        blt     $18,$143
-
-        ldq     $20,0($17)      # 1 1
-
-        br      $142
-
-        .align 4
-$145:
-        ldq     $20,0($17)      # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        umulh   $20,$19,$20     # 4 2
-        addq    $5,$0,$5        # 4 2 3 1
-         addq   $16,8,$16
-        cmpult  $5,$0,$0        # 4 2 3 2
-         addq   $17,8,$17
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $5,-8($16)      # 4 2 4
-
-        bgt     $18,$145
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$143:
-        addq    $18,4,$18
-        bgt     $18,$145        # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_words
-        .align 3
-        .globl bn_sqr_words
-        .ent bn_sqr_words
-bn_sqr_words:
-bn_sqr_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $18,4,$18
-        blt     $18,$543        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$542:
-        mulq    $20,$20,$5              ######
-         ldq    $21,8($17)      # 1 1
-        subq    $18,4
-        umulh   $20,$20,$1              ######
-        ldq     $27,16($17)     # 1 1
-        mulq    $21,$21,$6              ######
-        ldq     $28,24($17)     # 1 1
-        stq     $5,0($16)       # r[0]
-        umulh   $21,$21,$2              ######
-        stq     $1,8($16)       # r[1]
-        mulq    $27,$27,$7              ######
-        stq     $6,16($16)      # r[0]
-        umulh   $27,$27,$3              ######
-        stq     $2,24($16)      # r[1]
-        mulq    $28,$28,$8              ######
-        stq     $7,32($16)      # r[0]
-        umulh   $28,$28,$4              ######
-        stq     $3,40($16)      # r[1]
-
-        addq    $16,64,$16
-        addq    $17,32,$17
-        stq     $8,-16($16)     # r[0]
-        stq     $4,-8($16)      # r[1]
-
-        blt     $18,$543
-        ldq     $20,0($17)      # 1 1
-        br      $542
-
-$442:
-        ldq     $20,0($17)   # a[0]
-        mulq    $20,$20,$5  # a[0]*w low part       r2
-        addq    $16,16,$16
-        addq    $17,8,$17
-        subq    $18,1,$18
-        umulh   $20,$20,$1  # a[0]*w high part       r3
-        stq     $5,-16($16)   # r[0]
-        stq     $1,-8($16)   # r[1]
-
-        bgt     $18,$442
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$543:
-        addq    $18,4,$18
-        bgt     $18,$442        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sqr_words
-
-        .align 3
-        .globl bn_add_words
-        .ent bn_add_words
-bn_add_words:
-bn_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$0      # carry = 0
-        blt     $19,$900
-        ldq     $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-        .align 3
-$901:
-        addq    $1,$5,$1        # r=a+b;
-         ldq    $6,8($17)       # a[1]
-        cmpult  $1,$5,$22       # did we overflow?
-         ldq    $2,8($18)       # b[1]
-        addq    $1,$0,$1        # c+= overflow
-         ldq    $7,16($17)      # a[2]
-        cmpult  $1,$0,$0        # overflow?
-         ldq    $3,16($18)      # b[2]
-        addq    $0,$22,$0
-         ldq    $8,24($17)      # a[3]
-        addq    $2,$6,$2        # r=a+b;
-         ldq    $4,24($18)      # b[3]
-        cmpult  $2,$6,$23       # did we overflow?
-         addq   $3,$7,$3        # r=a+b;
-        addq    $2,$0,$2        # c+= overflow
-         cmpult $3,$7,$24       # did we overflow?
-        cmpult  $2,$0,$0        # overflow?
-         addq   $4,$8,$4        # r=a+b;
-        addq    $0,$23,$0
-         cmpult $4,$8,$25       # did we overflow?
-        addq    $3,$0,$3        # c+= overflow
-         stq    $1,0($16)       # r[0]=c
-        cmpult  $3,$0,$0        # overflow?
-         stq    $2,8($16)       # r[1]=c
-        addq    $0,$24,$0
-         stq    $3,16($16)      # r[2]=c
-        addq    $4,$0,$4        # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $4,$0,$0        # overflow?
-         addq   $17,32,$17      # a++
-        addq    $0,$25,$0
-         stq    $4,24($16)      # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$900
-         ldq    $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-         br     $901
-        .align 4
-$945:
-        ldq     $5,0($17)       # a[0]
-         ldq    $1,0($18)       # b[1]
-        addq    $1,$5,$1        # r=a+b;
-         subq   $19,1,$19       # loop--
-        addq    $1,$0,$1        # c+= overflow
-         addq   $17,8,$17       # a++
-        cmpult  $1,$5,$22       # did we overflow?
-         cmpult $1,$0,$0        # overflow?
-        addq    $18,8,$18       # b++
-         stq    $1,0($16)       # r[0]=c
-        addq    $0,$22,$0
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$945
-        ret     $31,($26),1     # else exit
-
-$900:
-        addq    $19,4,$19
-        bgt     $19,$945        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_add_words
-
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .align 3
-        .globl bn_div64
-        .ent bn_div64
-bn_div64:
-        ldgp $29,0($27)
-bn_div64..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$119
-        lda $0,-1
-        br $31,$136
-        .align 4
-$119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$126
-        zapnot $7,15,$27
-        br $31,$127
-        .align 4
-$126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$127:
-        srl $10,32,$4
-        .align 5
-$128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$129
-        subq $27,1,$27
-        br $31,$128
-        .align 4
-$129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$134
-        addq $9,$11,$9
-        subq $27,1,$27
-$134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$123
-        .align 4
-$124:
-        bis $13,$27,$0
-$136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div64
-
-        .set noat
-        .text
-        .align 3
-        .globl bn_sub_words
-        .ent bn_sub_words
-bn_sub_words:
-bn_sub_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,    4,      $19
-        bis     $31,    $31,    $0
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-$101:
-        ldq     $3,     8($17)
-        cmpult  $1,     $2,     $4
-        ldq     $5,     8($18)
-        subq    $1,     $2,     $1
-        ldq     $6,     16($17)
-        cmpult  $1,     $0,     $2
-        ldq     $7,     16($18)
-        subq    $1,     $0,     $23
-        ldq     $8,     24($17)
-        addq    $2,     $4,     $0
-        cmpult  $3,     $5,     $24
-        subq    $3,     $5,     $3
-        ldq     $22,    24($18)
-        cmpult  $3,     $0,     $5
-        subq    $3,     $0,     $25
-        addq    $5,     $24,    $0
-        cmpult  $6,     $7,     $27
-        subq    $6,     $7,     $6
-        stq     $23,    0($16)
-        cmpult  $6,     $0,     $7
-        subq    $6,     $0,     $28
-        addq    $7,     $27,    $0
-        cmpult  $8,     $22,    $21
-        subq    $8,     $22,    $8
-        stq     $25,    8($16)
-        cmpult  $8,     $0,     $22
-        subq    $8,     $0,     $20
-        addq    $22,    $21,    $0
-        stq     $28,    16($16)
-        subq    $19,    4,      $19
-        stq     $20,    24($16)
-        addq    $17,    32,     $17
-        addq    $18,    32,     $18
-        addq    $16,    32,     $16
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        br      $101
-$102:
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        cmpult  $1,     $2,     $27
-        subq    $1,     $2,     $1
-        cmpult  $1,     $0,     $2
-        subq    $1,     $0,     $1
-        stq     $1,     0($16)
-        addq    $2,     $27,    $0
-        addq    $17,    8,      $17
-        addq    $18,    8,      $18
-        addq    $16,    8,      $16
-        subq    $19,    1,      $19
-        bgt     $19,    $102
-        ret     $31,($26),1
-$100:
-        addq    $19,    4,      $19
-        bgt     $19,    $102
-$103:
-        ret     $31,($26),1
-        .end bn_sub_words
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/add.pl b/src/lib/libcrypto/bn/asm/alpha.works/add.pl
deleted file mode 100644
index 4dc76e6b69..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/add.pl
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        ($t0,$o0)=&NR(2);
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-        &ld($b0,&QWPw(0,$bp));  # get b
-
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);   # will we borrow?
-        &add($o0,$cc,$o0);      # will we borrow?
-        &cmpult($o0,$cc,$cc);   # will we borrow?
-        &add($cc,$t0,$cc);      # add the borrows
-        &st($o0,&QWPw(0,$rp));  # save
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &FR($o0,$t0,$a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/div.pl b/src/lib/libcrypto/bn/asm/alpha.works/div.pl
deleted file mode 100644
index 7ec144377f..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/div.pl
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/local/bin/perl
-
-sub bn_div64
-        {
-        local($data)=<<'EOF';
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .set noreorder
-        .set volatile
-        .align 3
-        .globl bn_div64
-        .ent bn_div64
-bn_div64:
-        ldgp $29,0($27)
-bn_div64..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$9119
-        lda $0,-1
-        br $31,$9136
-        .align 4
-$9119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$9120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$9120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$9120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$9122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$9122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$9123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$9126
-        zapnot $7,15,$27
-        br $31,$9127
-        .align 4
-$9126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$9127:
-        srl $10,32,$4
-        .align 5
-$9128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$9129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$9129
-        subq $27,1,$27
-        br $31,$9128
-        .align 4
-$9129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$9134
-        addq $9,$11,$9
-        subq $27,1,$27
-$9134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$9124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$9123
-        .align 4
-$9124:
-        bis $13,$27,$0
-$9136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div64
-EOF
-        &asm_add($data);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/mul.pl b/src/lib/libcrypto/bn/asm/alpha.works/mul.pl
deleted file mode 100644
index b182bae452..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/mul.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &mul($a0,$word,($l0)=&NR(1));
-         &add($ap,$QWS,$ap);
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-        &add($l0,$cc,$l0);
-         &add($rp,$QWS,$rp);
-         &sub($count,1,$count);
-        &cmpult($l0,$cc,$cc);
-        &st($l0,&QWPw(-1,$rp));         &FR($l0);
-        &add($h0,$cc,$cc);              &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/mul_add.pl b/src/lib/libcrypto/bn/asm/alpha.works/mul_add.pl
deleted file mode 100644
index e37f6315fb..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/mul_add.pl
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &ld(($r0)=&NR(1),&QWPw(0,$rp)); # get b
-        &mul($a0,$word,($l0)=&NR(1));
-         &sub($count,1,$count);
-         &add($ap,$QWS,$ap);
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-        &add($r0,$l0,$r0);
-         &add($rp,$QWS,$rp);
-        &cmpult($r0,$l0,($t0)=&NR(1));  &FR($l0);
-         &add($r0,$cc,$r0);
-        &add($h0,$t0,$h0);              &FR($t0);
-         &cmpult($r0,$cc,$cc);
-        &st($r0,&QWPw(-1,$rp));         &FR($r0);
-         &add($h0,$cc,$cc);             &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/mul_c4.pl b/src/lib/libcrypto/bn/asm/alpha.works/mul_c4.pl
deleted file mode 100644
index 5efd201281..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/mul_c4.pl
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &mul($a[0],$b[0],($r00)=&NR(1));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &muh($a[0],$b[0],($r01)=&NR(1));
-        &FR($ap); &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &FR($bp); &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &mul($a[0],$b[1],($r02)=&NR(1));
-
-        ($R,$H1,$H2)=&NR(3);
-
-        &st($r00,&QWPw(0,$rp)); &FR($r00);
-
-        &mov("zero",$R);
-        &mul($a[1],$b[0],($r03)=&NR(1));
-
-        &mov("zero",$H1);
-        &mov("zero",$H0);
-         &add($R,$r01,$R);
-        &muh($a[0],$b[1],($r04)=&NR(1));
-         &cmpult($R,$r01,($t01)=&NR(1));        &FR($r01);
-         &add($R,$r02,$R);
-         &add($H1,$t01,$H1)                     &FR($t01);
-        &muh($a[1],$b[0],($r05)=&NR(1));
-         &cmpult($R,$r02,($t02)=&NR(1));        &FR($r02);
-         &add($R,$r03,$R);
-         &add($H2,$t02,$H2)                     &FR($t02);
-        &mul($a[0],$b[2],($r06)=&NR(1));
-         &cmpult($R,$r03,($t03)=&NR(1));        &FR($r03);
-         &add($H1,$t03,$H1)                     &FR($t03);
-        &st($R,&QWPw(1,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r04,$R);
-        &mov("zero",$H2);
-        &mul($a[1],$b[1],($r07)=&NR(1));
-         &cmpult($R,$r04,($t04)=&NR(1));        &FR($r04);
-         &add($R,$r05,$R);
-         &add($H1,$t04,$H1)                     &FR($t04);
-        &mul($a[2],$b[0],($r08)=&NR(1));
-         &cmpult($R,$r05,($t05)=&NR(1));        &FR($r05);
-         &add($R,$r01,$R);
-         &add($H2,$t05,$H2)                     &FR($t05);
-        &muh($a[0],$b[2],($r09)=&NR(1));
-         &cmpult($R,$r06,($t06)=&NR(1));        &FR($r06);
-         &add($R,$r07,$R);
-         &add($H1,$t06,$H1)                     &FR($t06);
-        &muh($a[1],$b[1],($r10)=&NR(1));
-         &cmpult($R,$r07,($t07)=&NR(1));        &FR($r07);
-         &add($R,$r08,$R);
-         &add($H2,$t07,$H2)                     &FR($t07);
-        &muh($a[2],$b[0],($r11)=&NR(1));
-         &cmpult($R,$r08,($t08)=&NR(1));        &FR($r08);
-         &add($H1,$t08,$H1)                     &FR($t08);
-        &st($R,&QWPw(2,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r09,$R);
-        &mov("zero",$H2);
-        &mul($a[0],$b[3],($r12)=&NR(1));
-         &cmpult($R,$r09,($t09)=&NR(1));        &FR($r09);
-         &add($R,$r10,$R);
-         &add($H1,$t09,$H1)                     &FR($t09);
-        &mul($a[1],$b[2],($r13)=&NR(1));
-         &cmpult($R,$r10,($t10)=&NR(1));        &FR($r10);
-         &add($R,$r11,$R);
-         &add($H1,$t10,$H1)                     &FR($t10);
-        &mul($a[2],$b[1],($r14)=&NR(1));
-         &cmpult($R,$r11,($t11)=&NR(1));        &FR($r11);
-         &add($R,$r12,$R);
-         &add($H1,$t11,$H1)                     &FR($t11);
-        &mul($a[3],$b[0],($r15)=&NR(1));
-         &cmpult($R,$r12,($t12)=&NR(1));        &FR($r12);
-         &add($R,$r13,$R);
-         &add($H1,$t12,$H1)                     &FR($t12);
-        &muh($a[0],$b[3],($r16)=&NR(1));
-         &cmpult($R,$r13,($t13)=&NR(1));        &FR($r13);
-         &add($R,$r14,$R);
-         &add($H1,$t13,$H1)                     &FR($t13);
-        &muh($a[1],$b[2],($r17)=&NR(1));
-         &cmpult($R,$r14,($t14)=&NR(1));        &FR($r14);
-         &add($R,$r15,$R);
-         &add($H1,$t14,$H1)                     &FR($t14);
-        &muh($a[2],$b[1],($r18)=&NR(1));
-         &cmpult($R,$r15,($t15)=&NR(1));        &FR($r15);
-         &add($H1,$t15,$H1)                     &FR($t15);
-        &st($R,&QWPw(3,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r16,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[0],($r19)=&NR(1));
-         &cmpult($R,$r16,($t16)=&NR(1));        &FR($r16);
-         &add($R,$r17,$R);
-         &add($H1,$t16,$H1)                     &FR($t16);
-        &mul($a[1],$b[3],($r20)=&NR(1));
-         &cmpult($R,$r17,($t17)=&NR(1));        &FR($r17);
-         &add($R,$r18,$R);
-         &add($H1,$t17,$H1)                     &FR($t17);
-        &mul($a[2],$b[2],($r21)=&NR(1));
-         &cmpult($R,$r18,($t18)=&NR(1));        &FR($r18);
-         &add($R,$r19,$R);
-         &add($H1,$t18,$H1)                     &FR($t18);
-        &mul($a[3],$b[1],($r22)=&NR(1));
-         &cmpult($R,$r19,($t19)=&NR(1));        &FR($r19);
-         &add($R,$r20,$R);
-         &add($H1,$t19,$H1)                     &FR($t19);
-        &muh($a[1],$b[3],($r23)=&NR(1));
-         &cmpult($R,$r20,($t20)=&NR(1));        &FR($r20);
-         &add($R,$r21,$R);
-         &add($H1,$t20,$H1)                     &FR($t20);
-        &muh($a[2],$b[2],($r24)=&NR(1));
-         &cmpult($R,$r21,($t21)=&NR(1));        &FR($r21);
-         &add($R,$r22,$R);
-         &add($H1,$t21,$H1)                     &FR($t21);
-        &muh($a[3],$b[1],($r25)=&NR(1));
-         &cmpult($R,$r22,($t22)=&NR(1));        &FR($r22);
-         &add($H1,$t22,$H1)                     &FR($t22);
-        &st($R,&QWPw(4,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r23,$R);
-        &mov("zero",$H2);
-        &mul($a[2],$b[3],($r26)=&NR(1));
-         &cmpult($R,$r23,($t23)=&NR(1));        &FR($r23);
-         &add($R,$r24,$R);
-         &add($H1,$t23,$H1)                     &FR($t23);
-        &mul($a[3],$b[2],($r27)=&NR(1));
-         &cmpult($R,$r24,($t24)=&NR(1));        &FR($r24);
-         &add($R,$r25,$R);
-         &add($H1,$t24,$H1)                     &FR($t24);
-        &muh($a[2],$b[3],($r28)=&NR(1));
-         &cmpult($R,$r25,($t25)=&NR(1));        &FR($r25);
-         &add($R,$r26,$R);
-         &add($H1,$t25,$H1)                     &FR($t25);
-        &muh($a[3],$b[2],($r29)=&NR(1));
-         &cmpult($R,$r26,($t26)=&NR(1));        &FR($r26);
-         &add($R,$r27,$R);
-         &add($H1,$t26,$H1)                     &FR($t26);
-        &mul($a[3],$b[3],($r30)=&NR(1));
-         &cmpult($R,$r27,($t27)=&NR(1));        &FR($r27);
-         &add($H1,$t27,$H1)                     &FR($t27);
-        &st($R,&QWPw(5,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r28,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[3],($r31)=&NR(1));
-         &cmpult($R,$r28,($t28)=&NR(1));        &FR($r28);
-         &add($R,$r29,$R);
-         &add($H1,$t28,$H1)                     &FR($t28);
-        ############
-         &cmpult($R,$r29,($t29)=&NR(1));        &FR($r29);
-         &add($R,$r30,$R);
-         &add($H1,$t29,$H1)                     &FR($t29);
-        ############
-         &cmpult($R,$r30,($t30)=&NR(1));        &FR($r30);
-         &add($H1,$t30,$H1)                     &FR($t30);
-        &st($R,&QWPw(6,$rp));
-        &add($H1,$H2,$R);
-
-         &add($R,$r31,$R);                      &FR($r31);
-        &st($R,&QWPw(7,$rp));
-
-        &FR($R,$H1,$H2);
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/mul_c4.works.pl b/src/lib/libcrypto/bn/asm/alpha.works/mul_c4.works.pl
deleted file mode 100644
index 79d86dd25c..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/mul_c4.works.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-print STDERR "count=$cnt\n"; $cnt++;
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));       &FR($ap);
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);    &FR($a[3],$b[3]);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/mul_c8.pl b/src/lib/libcrypto/bn/asm/alpha.works/mul_c8.pl
deleted file mode 100644
index 525ca7494b..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/mul_c8.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &stack_push(2);
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &st($reg_s0,&swtmp(0)); &FR($reg_s0);
-        &st($reg_s1,&swtmp(1)); &FR($reg_s1);
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &ld(($a[4])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[4])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[5])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[5])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[6])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[6])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[7])=&NR(1),&QWPw(1,$ap));       &FR($ap);
-        &ld(($b[7])=&NR(1),&QWPw(1,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[7],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(7,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[7],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(8,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[7],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(9,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[7],$c0,$c1,$c2);    &FR($a[3]);
-        &mul_add_c($a[4],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[3],$c0,$c1,$c2);    &FR($b[3]);
-        &st($c0,&QWPw(10,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[4],$b[7],$c0,$c1,$c2);    &FR($a[4]);
-        &mul_add_c($a[5],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[4],$c0,$c1,$c2);    &FR($b[4]);
-        &st($c0,&QWPw(11,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[5],$b[7],$c0,$c1,$c2);    &FR($a[5]);
-        &mul_add_c($a[6],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[5],$c0,$c1,$c2);    &FR($b[5]);
-        &st($c0,&QWPw(12,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[6],$b[7],$c0,$c1,$c2);    &FR($a[6]);
-        &mul_add_c($a[7],$b[6],$c0,$c1,$c2);    &FR($b[6]);
-        &st($c0,&QWPw(13,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[7],$b[7],$c0,$c1,$c2);    &FR($a[7],$b[7]);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &ld($reg_s0,&swtmp(0));
-        &ld($reg_s1,&swtmp(1));
-        &stack_pop(2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/sqr.pl b/src/lib/libcrypto/bn/asm/alpha.works/sqr.pl
deleted file mode 100644
index a55b696906..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/sqr.pl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(3);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &mul($a0,$a0,($l0)=&NR(1));
-         &add($ap,$QWS,$ap);
-         &add($rp,2*$QWS,$rp);
-         &sub($count,1,$count);
-        &muh($a0,$a0,($h0)=&NR(1));     &FR($a0);
-        &st($l0,&QWPw(-2,$rp));         &FR($l0);
-        &st($h0,&QWPw(-1,$rp));         &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/sqr_c4.pl b/src/lib/libcrypto/bn/asm/alpha.works/sqr_c4.pl
deleted file mode 100644
index bf33f5b503..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/sqr_c4.pl
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub sqr_add_c
-        {
-        local($a,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$a,($l1)=&NR(1));
-        &muh($a,$a,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c1,$t1,$c1);              &FR($t1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub sqr_add_c2
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &cmplt($l1,"zero",($lc1)=&NR(1));
-        &cmplt($h1,"zero",($hc1)=&NR(1));
-        &add($l1,$l1,$l1);
-        &add($h1,$h1,$h1);
-        &add($h1,$lc1,$h1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($lc1)=&NR(1)); &FR($l1);
-        &cmpult($c1,$h1,($hc1)=&NR(1)); &FR($h1);
-
-        &add($c1,$lc1,$c1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-        }
-
-
-sub bn_sqr_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[0],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/sqr_c8.pl b/src/lib/libcrypto/bn/asm/alpha.works/sqr_c8.pl
deleted file mode 100644
index b4afe085f1..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/sqr_c8.pl
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($a[4])=&NR(1),&QWPw(4,$ap));
-        &ld(($a[5])=&NR(1),&QWPw(5,$ap));
-        &ld(($a[6])=&NR(1),&QWPw(6,$ap));
-        &ld(($a[7])=&NR(1),&QWPw(7,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[1],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[4],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(7,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(8,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[5],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(9,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(10,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[6],$a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[4],$c0,$c1,$c2);
-        &st($c0,&QWPw(11,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[6],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[5],$c0,$c1,$c2);
-        &st($c0,&QWPw(12,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[7],$a[6],$c0,$c1,$c2);
-        &st($c0,&QWPw(13,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[7],$c0,$c1,$c2);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha.works/sub.pl b/src/lib/libcrypto/bn/asm/alpha.works/sub.pl
deleted file mode 100644
index d998da5c21..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha.works/sub.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        ($a1,$tmp,$b1,$a2,$b2,$a3,$b3,$o0)=&NR(8);
-        &ld($a1,&QWPw(1,$ap));
-         &cmpult($a0,$b0,$tmp); # will we borrow?
-        &ld($b1,&QWPw(1,$bp));
-         &sub($a0,$b0,$a0);             # do the subtract
-        &ld($a2,&QWPw(2,$ap));
-         &cmpult($a0,$cc,$b0);  # will we borrow?
-        &ld($b2,&QWPw(2,$bp));
-         &sub($a0,$cc,$o0);     # will we borrow?
-        &ld($a3,&QWPw(3,$ap));
-         &add($b0,$tmp,$cc); ($t1,$o1)=&NR(2); &FR($tmp);
-
-        &cmpult($a1,$b1,$t1);   # will we borrow?
-         &sub($a1,$b1,$a1);     # do the subtract
-        &ld($b3,&QWPw(3,$bp));
-         &cmpult($a1,$cc,$b1);  # will we borrow?
-        &sub($a1,$cc,$o1);      # will we borrow?
-         &add($b1,$t1,$cc); ($tmp,$o2)=&NR(2); &FR($t1,$a1,$b1);
-        
-        &cmpult($a2,$b2,$tmp);  # will we borrow?
-         &sub($a2,$b2,$a2);             # do the subtract
-        &st($o0,&QWPw(0,$rp));  &FR($o0); # save
-         &cmpult($a2,$cc,$b2);  # will we borrow?
-        &sub($a2,$cc,$o2);      # will we borrow?
-         &add($b2,$tmp,$cc); ($t3,$o3)=&NR(2); &FR($tmp,$a2,$b2);
-
-        &cmpult($a3,$b3,$t3);   # will we borrow?
-         &sub($a3,$b3,$a3);     # do the subtract
-        &st($o1,&QWPw(1,$rp)); &FR($o1);
-         &cmpult($a3,$cc,$b3);  # will we borrow?
-        &sub($a3,$cc,$o3);      # will we borrow?
-         &add($b3,$t3,$cc); &FR($t3,$a3,$b3);
-
-        &st($o2,&QWPw(2,$rp));  &FR($o2);
-         &sub($count,4,$count); # count-=4
-        &st($o3,&QWPw(3,$rp));  &FR($o3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &cmpult($a0,$b0,$tmp);  # will we borrow?
-        &sub($a0,$b0,$a0);      # do the subtract
-        &cmpult($a0,$cc,$b0);   # will we borrow?
-        &sub($a0,$cc,$a0);      # will we borrow?
-        &st($a0,&QWPw(0,$rp));  # save
-        &add($b0,$tmp,$cc);     # add the borrows
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &FR($a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/add.pl b/src/lib/libcrypto/bn/asm/alpha/add.pl
deleted file mode 100644
index 13bf516428..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/add.pl
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-         &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-
-##########################################################
-        &set_label("loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap));
-         &ld(($b0)=&NR(1),&QWPw(0,$bp));
-        &ld(($a1)=&NR(1),&QWPw(1,$ap));
-         &ld(($b1)=&NR(1),&QWPw(1,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-         &ld(($a2)=&NR(1),&QWPw(2,$ap));
-        &cmpult($o0,$b0,$t0);
-         &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-         &ld(($b2)=&NR(1),&QWPw(2,$bp));
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-         &add($a1,$b1,$o1);     &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-         &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-         &ld(($a3)=&NR(1),&QWPw(3,$ap));
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-         &add($a2,$b2,$o2);     &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-         &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-         &ld(($b3)=&NR(1),&QWPw(3,$bp));
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-         &add($cc,$t2,$cc);     &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-         &add($a3,$b3,$o3);     &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-         &add($o3,$cc,$o3);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-         &cmpult($o3,$cc,$cc);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-         &add($cc,$t3,$cc);     &FR($t3);
-
-
-        &sub($count,4,$count);  # count-=4
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        ###
-         &bge($count,&label("loop"));
-        ###
-        &br(&label("finish"));
-##################################################
-        # Do the last 0..3 words
-
-        ($t0,$o0)=&NR(2);
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &add($ap,$QWS,$ap);
-         &add($bp,$QWS,$bp);
-        &add($a0,$b0,$o0); 
-         &sub($count,1,$count);
-        &cmpult($o0,$b0,$t0);   # will we borrow?
-         &add($o0,$cc,$o0);     # will we borrow?
-        &cmpult($o0,$cc,$cc);   # will we borrow?
-         &add($rp,$QWS,$rp);
-        &st($o0,&QWPw(-1,$rp)); # save
-         &add($cc,$t0,$cc);     # add the borrows
-
-        ###
-         &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-         &bgt($count,&label("last_loop"));
-
-        &FR($o0,$t0,$a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/div.pl b/src/lib/libcrypto/bn/asm/alpha/div.pl
deleted file mode 100644
index e9e680897a..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/div.pl
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/local/bin/perl
-
-sub bn_div_words
-        {
-        local($data)=<<'EOF';
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .set noreorder
-        .set volatile
-        .align 3
-        .globl bn_div_words
-        .ent bn_div_words
-bn_div_words
-        ldgp $29,0($27)
-bn_div_words.ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$9119
-        lda $0,-1
-        br $31,$9136
-        .align 4
-$9119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$9120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$9120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$9120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$9122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$9122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$9123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$9126
-        zapnot $7,15,$27
-        br $31,$9127
-        .align 4
-$9126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$9127:
-        srl $10,32,$4
-        .align 5
-$9128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$9129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$9129
-        subq $27,1,$27
-        br $31,$9128
-        .align 4
-$9129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$9134
-        addq $9,$11,$9
-        subq $27,1,$27
-$9134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$9124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$9123
-        .align 4
-$9124:
-        bis $13,$27,$0
-$9136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div_words
-EOF
-        &asm_add($data);
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/mul.pl b/src/lib/libcrypto/bn/asm/alpha/mul.pl
deleted file mode 100644
index 76c926566c..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/mul.pl
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-         &mov("zero",$cc);
-        ###
-         &blt($count,&label("finish"));
-
-        ($a0)=&NR(1); &ld($a0,&QWPw(0,$ap));
-
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-         ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-         ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-                                                        ### wait 8
-        &mul($a0,$word,($l0)=&NR(1));   &FR($a0);
-                                                        ### wait 8
-        &muh($a1,$word,($h1)=&NR(1));   &FR($a1);
-         &add($l0,$cc,$l0);                             ### wait 8
-        &mul($a1,$word,($l1)=&NR(1));   &FR($a1);
-         &cmpult($l0,$cc,$cc);                          ### wait 8
-        &muh($a2,$word,($h2)=&NR(1));   &FR($a2);
-         &add($h0,$cc,$cc);     &FR($h0);               ### wait 8
-        &mul($a2,$word,($l2)=&NR(1));   &FR($a2);
-         &add($l1,$cc,$l1);                             ### wait 8
-        &st($l0,&QWPw(0,$rp));          &FR($l0);
-         &cmpult($l1,$cc,$cc);                          ### wait 8
-        &muh($a3,$word,($h3)=&NR(1));   &FR($a3);
-         &add($h1,$cc,$cc);             &FR($h1);
-        &mul($a3,$word,($l3)=&NR(1));   &FR($a3);
-         &add($l2,$cc,$l2);
-        &st($l1,&QWPw(1,$rp));          &FR($l1);
-         &cmpult($l2,$cc,$cc);
-        &add($h2,$cc,$cc);              &FR($h2);
-         &sub($count,4,$count); # count-=4
-        &st($l2,&QWPw(2,$rp));          &FR($l2);
-         &add($l3,$cc,$l3);
-        &cmpult($l3,$cc,$cc);
-         &add($bp,4*$QWS,$bp);  # count+=4
-        &add($h3,$cc,$cc);              &FR($h3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &st($l3,&QWPw(3,$rp));          &FR($l3);
-         &add($rp,4*$QWS,$rp);  # count+=4
-        ###
-         &blt($count,&label("finish"));
-         ($a0)=&NR(1); &ld($a0,&QWPw(0,$ap));
-        &br(&label("finish"));
-##################################################
-
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-         ###
-        ###
-         ###
-        &muh($a0,$word,($h0)=&NR(1));
-         ### Wait 8 for next mul issue
-        &mul($a0,$word,($l0)=&NR(1)); &FR($a0)
-         &add($ap,$QWS,$ap);
-        ### Loose 12 until result is available
-        &add($rp,$QWS,$rp);
-         &sub($count,1,$count);
-        &add($l0,$cc,$l0);
-         ###
-        &st($l0,&QWPw(-1,$rp));         &FR($l0);
-         &cmpult($l0,$cc,$cc);
-        &add($h0,$cc,$cc);              &FR($h0);
-         &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/mul_add.pl b/src/lib/libcrypto/bn/asm/alpha/mul_add.pl
deleted file mode 100644
index 0d6df69bc4..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/mul_add.pl
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-         &mov("zero",$cc);
-        ###
-         &blt($count,&label("finish"));
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        &ld(($r0)=&NR(1),&QWPw(0,$rp));
-         &ld(($a1)=&NR(1),&QWPw(1,$ap));
-        &muh($a0,$word,($h0)=&NR(1));
-         &ld(($r1)=&NR(1),&QWPw(1,$rp));
-        &ld(($a2)=&NR(1),&QWPw(2,$ap));
-         ###
-        &mul($a0,$word,($l0)=&NR(1));   &FR($a0);
-         &ld(($r2)=&NR(1),&QWPw(2,$rp));
-        &muh($a1,$word,($h1)=&NR(1));
-         &ld(($a3)=&NR(1),&QWPw(3,$ap));
-        &mul($a1,$word,($l1)=&NR(1));   &FR($a1);
-         &ld(($r3)=&NR(1),&QWPw(3,$rp));
-        &add($r0,$l0,$r0);
-         &add($r1,$l1,$r1);
-        &cmpult($r0,$l0,($t0)=&NR(1));  &FR($l0);
-         &cmpult($r1,$l1,($t1)=&NR(1)); &FR($l1);
-        &muh($a2,$word,($h2)=&NR(1));
-         &add($r0,$cc,$r0);
-        &add($h0,$t0,$h0);              &FR($t0);
-         &cmpult($r0,$cc,$cc);
-        &add($h1,$t1,$h1);              &FR($t1);
-         &add($h0,$cc,$cc);             &FR($h0);
-        &mul($a2,$word,($l2)=&NR(1));   &FR($a2);
-         &add($r1,$cc,$r1);
-        &cmpult($r1,$cc,$cc);
-         &add($r2,$l2,$r2);
-        &add($h1,$cc,$cc);              &FR($h1);
-         &cmpult($r2,$l2,($t2)=&NR(1)); &FR($l2);
-        &muh($a3,$word,($h3)=&NR(1));
-         &add($r2,$cc,$r2);
-        &st($r0,&QWPw(0,$rp)); &FR($r0);
-         &add($h2,$t2,$h2);             &FR($t2);
-        &st($r1,&QWPw(1,$rp)); &FR($r1);
-         &cmpult($r2,$cc,$cc);
-        &mul($a3,$word,($l3)=&NR(1));   &FR($a3);
-         &add($h2,$cc,$cc);             &FR($h2);
-        &st($r2,&QWPw(2,$rp)); &FR($r2);
-         &sub($count,4,$count); # count-=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-        &add($r3,$l3,$r3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &cmpult($r3,$l3,($t3)=&NR(1));  &FR($l3);
-         &add($r3,$cc,$r3);
-        &add($h3,$t3,$h3);              &FR($t3);
-         &cmpult($r3,$cc,$cc);
-        &st($r3,&QWPw(-1,$rp)); &FR($r3);
-         &add($h3,$cc,$cc);             &FR($h3);
-
-        ###
-         &blt($count,&label("finish"));
-        &ld(($a0)=&NR(1),&QWPw(0,$ap));
-         &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-         &ld(($r0)=&NR(1),&QWPw(0,$rp));        # get b
-        ###
-         ###
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-         ### wait 8
-        &mul($a0,$word,($l0)=&NR(1));   &FR($a0);
-         &add($rp,$QWS,$rp);
-        &add($ap,$QWS,$ap);
-         &sub($count,1,$count);
-        ### wait 3 until l0 is available
-        &add($r0,$l0,$r0);
-         ###
-        &cmpult($r0,$l0,($t0)=&NR(1));  &FR($l0);
-         &add($r0,$cc,$r0);
-        &add($h0,$t0,$h0);              &FR($t0);
-         &cmpult($r0,$cc,$cc);
-        &add($h0,$cc,$cc);              &FR($h0);
-
-        &st($r0,&QWPw(-1,$rp));         &FR($r0);
-         &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-         &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/mul_c4.pl b/src/lib/libcrypto/bn/asm/alpha/mul_c4.pl
deleted file mode 100644
index 9cc876ded4..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/mul_c4.pl
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-# upto
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &mul($a[0],$b[0],($r00)=&NR(1));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &muh($a[0],$b[0],($r01)=&NR(1));
-        &FR($ap); &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &FR($bp); &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &mul($a[0],$b[1],($r02)=&NR(1));
-
-        ($R,$H1,$H2)=&NR(3);
-
-        &st($r00,&QWPw(0,$rp)); &FR($r00);
-
-        &mov("zero",$R);
-        &mul($a[1],$b[0],($r03)=&NR(1));
-
-        &mov("zero",$H1);
-        &mov("zero",$H0);
-         &add($R,$r01,$R);
-        &muh($a[0],$b[1],($r04)=&NR(1));
-         &cmpult($R,$r01,($t01)=&NR(1));        &FR($r01);
-         &add($R,$r02,$R);
-         &add($H1,$t01,$H1)                     &FR($t01);
-        &muh($a[1],$b[0],($r05)=&NR(1));
-         &cmpult($R,$r02,($t02)=&NR(1));        &FR($r02);
-         &add($R,$r03,$R);
-         &add($H2,$t02,$H2)                     &FR($t02);
-        &mul($a[0],$b[2],($r06)=&NR(1));
-         &cmpult($R,$r03,($t03)=&NR(1));        &FR($r03);
-         &add($H1,$t03,$H1)                     &FR($t03);
-        &st($R,&QWPw(1,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r04,$R);
-        &mov("zero",$H2);
-        &mul($a[1],$b[1],($r07)=&NR(1));
-         &cmpult($R,$r04,($t04)=&NR(1));        &FR($r04);
-         &add($R,$r05,$R);
-         &add($H1,$t04,$H1)                     &FR($t04);
-        &mul($a[2],$b[0],($r08)=&NR(1));
-         &cmpult($R,$r05,($t05)=&NR(1));        &FR($r05);
-         &add($R,$r01,$R);
-         &add($H2,$t05,$H2)                     &FR($t05);
-        &muh($a[0],$b[2],($r09)=&NR(1));
-         &cmpult($R,$r06,($t06)=&NR(1));        &FR($r06);
-         &add($R,$r07,$R);
-         &add($H1,$t06,$H1)                     &FR($t06);
-        &muh($a[1],$b[1],($r10)=&NR(1));
-         &cmpult($R,$r07,($t07)=&NR(1));        &FR($r07);
-         &add($R,$r08,$R);
-         &add($H2,$t07,$H2)                     &FR($t07);
-        &muh($a[2],$b[0],($r11)=&NR(1));
-         &cmpult($R,$r08,($t08)=&NR(1));        &FR($r08);
-         &add($H1,$t08,$H1)                     &FR($t08);
-        &st($R,&QWPw(2,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r09,$R);
-        &mov("zero",$H2);
-        &mul($a[0],$b[3],($r12)=&NR(1));
-         &cmpult($R,$r09,($t09)=&NR(1));        &FR($r09);
-         &add($R,$r10,$R);
-         &add($H1,$t09,$H1)                     &FR($t09);
-        &mul($a[1],$b[2],($r13)=&NR(1));
-         &cmpult($R,$r10,($t10)=&NR(1));        &FR($r10);
-         &add($R,$r11,$R);
-         &add($H1,$t10,$H1)                     &FR($t10);
-        &mul($a[2],$b[1],($r14)=&NR(1));
-         &cmpult($R,$r11,($t11)=&NR(1));        &FR($r11);
-         &add($R,$r12,$R);
-         &add($H1,$t11,$H1)                     &FR($t11);
-        &mul($a[3],$b[0],($r15)=&NR(1));
-         &cmpult($R,$r12,($t12)=&NR(1));        &FR($r12);
-         &add($R,$r13,$R);
-         &add($H1,$t12,$H1)                     &FR($t12);
-        &muh($a[0],$b[3],($r16)=&NR(1));
-         &cmpult($R,$r13,($t13)=&NR(1));        &FR($r13);
-         &add($R,$r14,$R);
-         &add($H1,$t13,$H1)                     &FR($t13);
-        &muh($a[1],$b[2],($r17)=&NR(1));
-         &cmpult($R,$r14,($t14)=&NR(1));        &FR($r14);
-         &add($R,$r15,$R);
-         &add($H1,$t14,$H1)                     &FR($t14);
-        &muh($a[2],$b[1],($r18)=&NR(1));
-         &cmpult($R,$r15,($t15)=&NR(1));        &FR($r15);
-         &add($H1,$t15,$H1)                     &FR($t15);
-        &st($R,&QWPw(3,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r16,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[0],($r19)=&NR(1));
-         &cmpult($R,$r16,($t16)=&NR(1));        &FR($r16);
-         &add($R,$r17,$R);
-         &add($H1,$t16,$H1)                     &FR($t16);
-        &mul($a[1],$b[3],($r20)=&NR(1));
-         &cmpult($R,$r17,($t17)=&NR(1));        &FR($r17);
-         &add($R,$r18,$R);
-         &add($H1,$t17,$H1)                     &FR($t17);
-        &mul($a[2],$b[2],($r21)=&NR(1));
-         &cmpult($R,$r18,($t18)=&NR(1));        &FR($r18);
-         &add($R,$r19,$R);
-         &add($H1,$t18,$H1)                     &FR($t18);
-        &mul($a[3],$b[1],($r22)=&NR(1));
-         &cmpult($R,$r19,($t19)=&NR(1));        &FR($r19);
-         &add($R,$r20,$R);
-         &add($H1,$t19,$H1)                     &FR($t19);
-        &muh($a[1],$b[3],($r23)=&NR(1));
-         &cmpult($R,$r20,($t20)=&NR(1));        &FR($r20);
-         &add($R,$r21,$R);
-         &add($H1,$t20,$H1)                     &FR($t20);
-        &muh($a[2],$b[2],($r24)=&NR(1));
-         &cmpult($R,$r21,($t21)=&NR(1));        &FR($r21);
-         &add($R,$r22,$R);
-         &add($H1,$t21,$H1)                     &FR($t21);
-        &muh($a[3],$b[1],($r25)=&NR(1));
-         &cmpult($R,$r22,($t22)=&NR(1));        &FR($r22);
-         &add($H1,$t22,$H1)                     &FR($t22);
-        &st($R,&QWPw(4,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r23,$R);
-        &mov("zero",$H2);
-        &mul($a[2],$b[3],($r26)=&NR(1));
-         &cmpult($R,$r23,($t23)=&NR(1));        &FR($r23);
-         &add($R,$r24,$R);
-         &add($H1,$t23,$H1)                     &FR($t23);
-        &mul($a[3],$b[2],($r27)=&NR(1));
-         &cmpult($R,$r24,($t24)=&NR(1));        &FR($r24);
-         &add($R,$r25,$R);
-         &add($H1,$t24,$H1)                     &FR($t24);
-        &muh($a[2],$b[3],($r28)=&NR(1));
-         &cmpult($R,$r25,($t25)=&NR(1));        &FR($r25);
-         &add($R,$r26,$R);
-         &add($H1,$t25,$H1)                     &FR($t25);
-        &muh($a[3],$b[2],($r29)=&NR(1));
-         &cmpult($R,$r26,($t26)=&NR(1));        &FR($r26);
-         &add($R,$r27,$R);
-         &add($H1,$t26,$H1)                     &FR($t26);
-        &mul($a[3],$b[3],($r30)=&NR(1));
-         &cmpult($R,$r27,($t27)=&NR(1));        &FR($r27);
-         &add($H1,$t27,$H1)                     &FR($t27);
-        &st($R,&QWPw(5,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r28,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[3],($r31)=&NR(1));
-         &cmpult($R,$r28,($t28)=&NR(1));        &FR($r28);
-         &add($R,$r29,$R);
-         &add($H1,$t28,$H1)                     &FR($t28);
-        ############
-         &cmpult($R,$r29,($t29)=&NR(1));        &FR($r29);
-         &add($R,$r30,$R);
-         &add($H1,$t29,$H1)                     &FR($t29);
-        ############
-         &cmpult($R,$r30,($t30)=&NR(1));        &FR($r30);
-         &add($H1,$t30,$H1)                     &FR($t30);
-        &st($R,&QWPw(6,$rp));
-        &add($H1,$H2,$R);
-
-         &add($R,$r31,$R);                      &FR($r31);
-        &st($R,&QWPw(7,$rp));
-
-        &FR($R,$H1,$H2);
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/mul_c4.works.pl b/src/lib/libcrypto/bn/asm/alpha/mul_c4.works.pl
deleted file mode 100644
index 79d86dd25c..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/mul_c4.works.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-print STDERR "count=$cnt\n"; $cnt++;
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));       &FR($ap);
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);    &FR($a[3],$b[3]);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/mul_c8.pl b/src/lib/libcrypto/bn/asm/alpha/mul_c8.pl
deleted file mode 100644
index 525ca7494b..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/mul_c8.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &stack_push(2);
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &st($reg_s0,&swtmp(0)); &FR($reg_s0);
-        &st($reg_s1,&swtmp(1)); &FR($reg_s1);
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &ld(($a[4])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[4])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[5])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[5])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[6])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[6])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[7])=&NR(1),&QWPw(1,$ap));       &FR($ap);
-        &ld(($b[7])=&NR(1),&QWPw(1,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[7],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(7,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[7],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(8,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[7],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(9,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[7],$c0,$c1,$c2);    &FR($a[3]);
-        &mul_add_c($a[4],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[3],$c0,$c1,$c2);    &FR($b[3]);
-        &st($c0,&QWPw(10,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[4],$b[7],$c0,$c1,$c2);    &FR($a[4]);
-        &mul_add_c($a[5],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[4],$c0,$c1,$c2);    &FR($b[4]);
-        &st($c0,&QWPw(11,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[5],$b[7],$c0,$c1,$c2);    &FR($a[5]);
-        &mul_add_c($a[6],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[5],$c0,$c1,$c2);    &FR($b[5]);
-        &st($c0,&QWPw(12,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[6],$b[7],$c0,$c1,$c2);    &FR($a[6]);
-        &mul_add_c($a[7],$b[6],$c0,$c1,$c2);    &FR($b[6]);
-        &st($c0,&QWPw(13,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[7],$b[7],$c0,$c1,$c2);    &FR($a[7],$b[7]);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &ld($reg_s0,&swtmp(0));
-        &ld($reg_s1,&swtmp(1));
-        &stack_pop(2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/sqr.pl b/src/lib/libcrypto/bn/asm/alpha/sqr.pl
deleted file mode 100644
index a55b696906..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/sqr.pl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(3);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &mul($a0,$a0,($l0)=&NR(1));
-         &add($ap,$QWS,$ap);
-         &add($rp,2*$QWS,$rp);
-         &sub($count,1,$count);
-        &muh($a0,$a0,($h0)=&NR(1));     &FR($a0);
-        &st($l0,&QWPw(-2,$rp));         &FR($l0);
-        &st($h0,&QWPw(-1,$rp));         &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/sqr_c4.pl b/src/lib/libcrypto/bn/asm/alpha/sqr_c4.pl
deleted file mode 100644
index bf33f5b503..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/sqr_c4.pl
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub sqr_add_c
-        {
-        local($a,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$a,($l1)=&NR(1));
-        &muh($a,$a,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c1,$t1,$c1);              &FR($t1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub sqr_add_c2
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &cmplt($l1,"zero",($lc1)=&NR(1));
-        &cmplt($h1,"zero",($hc1)=&NR(1));
-        &add($l1,$l1,$l1);
-        &add($h1,$h1,$h1);
-        &add($h1,$lc1,$h1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($lc1)=&NR(1)); &FR($l1);
-        &cmpult($c1,$h1,($hc1)=&NR(1)); &FR($h1);
-
-        &add($c1,$lc1,$c1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-        }
-
-
-sub bn_sqr_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[0],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/sqr_c8.pl b/src/lib/libcrypto/bn/asm/alpha/sqr_c8.pl
deleted file mode 100644
index b4afe085f1..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/sqr_c8.pl
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($a[4])=&NR(1),&QWPw(4,$ap));
-        &ld(($a[5])=&NR(1),&QWPw(5,$ap));
-        &ld(($a[6])=&NR(1),&QWPw(6,$ap));
-        &ld(($a[7])=&NR(1),&QWPw(7,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[1],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[4],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(7,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(8,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[5],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(9,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(10,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[6],$a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[4],$c0,$c1,$c2);
-        &st($c0,&QWPw(11,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[6],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[5],$c0,$c1,$c2);
-        &st($c0,&QWPw(12,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[7],$a[6],$c0,$c1,$c2);
-        &st($c0,&QWPw(13,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[7],$c0,$c1,$c2);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/alpha/sub.pl b/src/lib/libcrypto/bn/asm/alpha/sub.pl
deleted file mode 100644
index d998da5c21..0000000000
--- a/src/lib/libcrypto/bn/asm/alpha/sub.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        ($a1,$tmp,$b1,$a2,$b2,$a3,$b3,$o0)=&NR(8);
-        &ld($a1,&QWPw(1,$ap));
-         &cmpult($a0,$b0,$tmp); # will we borrow?
-        &ld($b1,&QWPw(1,$bp));
-         &sub($a0,$b0,$a0);             # do the subtract
-        &ld($a2,&QWPw(2,$ap));
-         &cmpult($a0,$cc,$b0);  # will we borrow?
-        &ld($b2,&QWPw(2,$bp));
-         &sub($a0,$cc,$o0);     # will we borrow?
-        &ld($a3,&QWPw(3,$ap));
-         &add($b0,$tmp,$cc); ($t1,$o1)=&NR(2); &FR($tmp);
-
-        &cmpult($a1,$b1,$t1);   # will we borrow?
-         &sub($a1,$b1,$a1);     # do the subtract
-        &ld($b3,&QWPw(3,$bp));
-         &cmpult($a1,$cc,$b1);  # will we borrow?
-        &sub($a1,$cc,$o1);      # will we borrow?
-         &add($b1,$t1,$cc); ($tmp,$o2)=&NR(2); &FR($t1,$a1,$b1);
-        
-        &cmpult($a2,$b2,$tmp);  # will we borrow?
-         &sub($a2,$b2,$a2);             # do the subtract
-        &st($o0,&QWPw(0,$rp));  &FR($o0); # save
-         &cmpult($a2,$cc,$b2);  # will we borrow?
-        &sub($a2,$cc,$o2);      # will we borrow?
-         &add($b2,$tmp,$cc); ($t3,$o3)=&NR(2); &FR($tmp,$a2,$b2);
-
-        &cmpult($a3,$b3,$t3);   # will we borrow?
-         &sub($a3,$b3,$a3);     # do the subtract
-        &st($o1,&QWPw(1,$rp)); &FR($o1);
-         &cmpult($a3,$cc,$b3);  # will we borrow?
-        &sub($a3,$cc,$o3);      # will we borrow?
-         &add($b3,$t3,$cc); &FR($t3,$a3,$b3);
-
-        &st($o2,&QWPw(2,$rp));  &FR($o2);
-         &sub($count,4,$count); # count-=4
-        &st($o3,&QWPw(3,$rp));  &FR($o3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &cmpult($a0,$b0,$tmp);  # will we borrow?
-        &sub($a0,$b0,$a0);      # do the subtract
-        &cmpult($a0,$cc,$b0);   # will we borrow?
-        &sub($a0,$cc,$a0);      # will we borrow?
-        &st($a0,&QWPw(0,$rp));  # save
-        &add($b0,$tmp,$cc);     # add the borrows
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &FR($a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libcrypto/bn/asm/bn-alpha.pl b/src/lib/libcrypto/bn/asm/bn-alpha.pl
deleted file mode 100644
index 302edf2376..0000000000
--- a/src/lib/libcrypto/bn/asm/bn-alpha.pl
+++ /dev/null
@@ -1,571 +0,0 @@
-#!/usr/local/bin/perl
-# I have this in perl so I can use more usefull register names and then convert
-# them into alpha registers.
-#
-
-$d=&data();
-$d =~ s/CC/0/g;
-$d =~ s/R1/1/g;
-$d =~ s/R2/2/g;
-$d =~ s/R3/3/g;
-$d =~ s/R4/4/g;
-$d =~ s/L1/5/g;
-$d =~ s/L2/6/g;
-$d =~ s/L3/7/g;
-$d =~ s/L4/8/g;
-$d =~ s/O1/22/g;
-$d =~ s/O2/23/g;
-$d =~ s/O3/24/g;
-$d =~ s/O4/25/g;
-$d =~ s/A1/20/g;
-$d =~ s/A2/21/g;
-$d =~ s/A3/27/g;
-$d =~ s/A4/28/g;
-if (0){
-}
-
-print $d;
-
-sub data
-        {
-        local($data)=<<'EOF';
-
- # DEC Alpha assember
- # The bn_div_words is actually gcc output but the other parts are hand done.
- # Thanks to tzeruch@ceddec.com for sending me the gcc output for
- # bn_div_words.
- # I've gone back and re-done most of routines.
- # The key thing to remeber for the 164 CPU is that while a
- # multiply operation takes 8 cycles, another one can only be issued
- # after 4 cycles have elapsed.  I've done modification to help
- # improve this.  Also, normally, a ld instruction will not be available
- # for about 3 cycles.
-        .file   1 "bn_asm.c"
-        .set noat
-gcc2_compiled.:
-__gnu_compiled_c:
-        .text
-        .align 3
-        .globl bn_mul_add_words
-        .ent bn_mul_add_words
-bn_mul_add_words:
-bn_mul_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$CC
-        blt     $18,$43         # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $A1,0($17)      # 1 1
-        ldq     $R1,0($16)      # 1 1
-        .align 3
-$42:
-        mulq    $A1,$19,$L1     # 1 2 1 ######
-        ldq     $A2,8($17)      # 2 1
-        ldq     $R2,8($16)      # 2 1
-        umulh   $A1,$19,$A1     # 1 2   ######
-        ldq     $A3,16($17)     # 3 1
-        ldq     $R3,16($16)     # 3 1
-        mulq    $A2,$19,$L2     # 2 2 1 ######
-         ldq    $A4,24($17)     # 4 1
-        addq    $R1,$L1,$R1     # 1 2 2
-         ldq    $R4,24($16)     # 4 1
-        umulh   $A2,$19,$A2     # 2 2   ######
-         cmpult $R1,$L1,$O1     # 1 2 3 1
-        addq    $A1,$O1,$A1     # 1 3 1
-         addq   $R1,$CC,$R1     # 1 2 3 1
-        mulq    $A3,$19,$L3     # 3 2 1 ######
-         cmpult $R1,$CC,$CC     # 1 2 3 2
-        addq    $R2,$L2,$R2     # 2 2 2
-         addq   $A1,$CC,$CC     # 1 3 2 
-        cmpult  $R2,$L2,$O2     # 2 2 3 1
-         addq   $A2,$O2,$A2     # 2 3 1
-        umulh   $A3,$19,$A3     # 3 2   ######
-         addq   $R2,$CC,$R2     # 2 2 3 1
-        cmpult  $R2,$CC,$CC     # 2 2 3 2
-         subq   $18,4,$18
-        mulq    $A4,$19,$L4     # 4 2 1 ######
-         addq   $A2,$CC,$CC     # 2 3 2 
-        addq    $R3,$L3,$R3     # 3 2 2
-         addq   $16,32,$16
-        cmpult  $R3,$L3,$O3     # 3 2 3 1
-         stq    $R1,-32($16)    # 1 2 4
-        umulh   $A4,$19,$A4     # 4 2   ######
-         addq   $A3,$O3,$A3     # 3 3 1
-        addq    $R3,$CC,$R3     # 3 2 3 1
-         stq    $R2,-24($16)    # 2 2 4
-        cmpult  $R3,$CC,$CC     # 3 2 3 2
-         stq    $R3,-16($16)    # 3 2 4
-        addq    $R4,$L4,$R4     # 4 2 2
-         addq   $A3,$CC,$CC     # 3 3 2 
-        cmpult  $R4,$L4,$O4     # 4 2 3 1
-         addq   $17,32,$17
-        addq    $A4,$O4,$A4     # 4 3 1
-         addq   $R4,$CC,$R4     # 4 2 3 1
-        cmpult  $R4,$CC,$CC     # 4 2 3 2
-         stq    $R4,-8($16)     # 4 2 4
-        addq    $A4,$CC,$CC     # 4 3 2 
-         blt    $18,$43
-
-        ldq     $A1,0($17)      # 1 1
-        ldq     $R1,0($16)      # 1 1
-
-        br      $42
-
-        .align 4
-$45:
-        ldq     $A1,0($17)      # 4 1
-        ldq     $R1,0($16)      # 4 1
-        mulq    $A1,$19,$L1     # 4 2 1
-        subq    $18,1,$18
-        addq    $16,8,$16
-        addq    $17,8,$17
-        umulh   $A1,$19,$A1     # 4 2
-        addq    $R1,$L1,$R1     # 4 2 2
-        cmpult  $R1,$L1,$O1     # 4 2 3 1
-        addq    $A1,$O1,$A1     # 4 3 1
-        addq    $R1,$CC,$R1     # 4 2 3 1
-        cmpult  $R1,$CC,$CC     # 4 2 3 2
-        addq    $A1,$CC,$CC     # 4 3 2 
-        stq     $R1,-8($16)     # 4 2 4
-        bgt     $18,$45
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$43:
-        addq    $18,4,$18
-        bgt     $18,$45         # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_add_words
-        .align 3
-        .globl bn_mul_words
-        .ent bn_mul_words
-bn_mul_words:
-bn_mul_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$CC
-        blt     $18,$143        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $A1,0($17)      # 1 1
-        .align 3
-$142:
-
-        mulq    $A1,$19,$L1     # 1 2 1 #####
-         ldq    $A2,8($17)      # 2 1
-         ldq    $A3,16($17)     # 3 1
-        umulh   $A1,$19,$A1     # 1 2   #####
-         ldq    $A4,24($17)     # 4 1
-        mulq    $A2,$19,$L2     # 2 2 1 #####
-         addq   $L1,$CC,$L1     # 1 2 3 1
-        subq    $18,4,$18
-         cmpult $L1,$CC,$CC     # 1 2 3 2
-        umulh   $A2,$19,$A2     # 2 2   #####
-         addq   $A1,$CC,$CC     # 1 3 2 
-        addq    $17,32,$17
-         addq   $L2,$CC,$L2     # 2 2 3 1
-        mulq    $A3,$19,$L3     # 3 2 1 #####
-         cmpult $L2,$CC,$CC     # 2 2 3 2
-        addq    $A2,$CC,$CC     # 2 3 2 
-         addq   $16,32,$16
-        umulh   $A3,$19,$A3     # 3 2   #####
-         stq    $L1,-32($16)    # 1 2 4
-        mulq    $A4,$19,$L4     # 4 2 1 #####
-         addq   $L3,$CC,$L3     # 3 2 3 1
-        stq     $L2,-24($16)    # 2 2 4
-         cmpult $L3,$CC,$CC     # 3 2 3 2
-        umulh   $A4,$19,$A4     # 4 2   #####
-         addq   $A3,$CC,$CC     # 3 3 2 
-        stq     $L3,-16($16)    # 3 2 4
-         addq   $L4,$CC,$L4     # 4 2 3 1
-        cmpult  $L4,$CC,$CC     # 4 2 3 2
-
-        addq    $A4,$CC,$CC     # 4 3 2 
-
-        stq     $L4,-8($16)     # 4 2 4
-
-        blt     $18,$143
-
-        ldq     $A1,0($17)      # 1 1
-
-        br      $142
-
-        .align 4
-$145:
-        ldq     $A1,0($17)      # 4 1
-        mulq    $A1,$19,$L1     # 4 2 1
-        subq    $18,1,$18
-        umulh   $A1,$19,$A1     # 4 2
-        addq    $L1,$CC,$L1     # 4 2 3 1
-         addq   $16,8,$16
-        cmpult  $L1,$CC,$CC     # 4 2 3 2
-         addq   $17,8,$17
-        addq    $A1,$CC,$CC     # 4 3 2 
-        stq     $L1,-8($16)     # 4 2 4
-
-        bgt     $18,$145
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$143:
-        addq    $18,4,$18
-        bgt     $18,$145        # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_words
-        .align 3
-        .globl bn_sqr_words
-        .ent bn_sqr_words
-bn_sqr_words:
-bn_sqr_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $18,4,$18
-        blt     $18,$543        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $A1,0($17)      # 1 1
-        .align 3
-$542:
-        mulq    $A1,$A1,$L1             ######
-         ldq    $A2,8($17)      # 1 1
-        subq    $18,4
-        umulh   $A1,$A1,$R1             ######
-        ldq     $A3,16($17)     # 1 1
-        mulq    $A2,$A2,$L2             ######
-        ldq     $A4,24($17)     # 1 1
-        stq     $L1,0($16)      # r[0]
-        umulh   $A2,$A2,$R2             ######
-        stq     $R1,8($16)      # r[1]
-        mulq    $A3,$A3,$L3             ######
-        stq     $L2,16($16)     # r[0]
-        umulh   $A3,$A3,$R3             ######
-        stq     $R2,24($16)     # r[1]
-        mulq    $A4,$A4,$L4             ######
-        stq     $L3,32($16)     # r[0]
-        umulh   $A4,$A4,$R4             ######
-        stq     $R3,40($16)     # r[1]
-
-        addq    $16,64,$16
-        addq    $17,32,$17
-        stq     $L4,-16($16)    # r[0]
-        stq     $R4,-8($16)     # r[1]
-
-        blt     $18,$543
-        ldq     $A1,0($17)      # 1 1
-        br      $542
-
-$442:
-        ldq     $A1,0($17)   # a[0]
-        mulq    $A1,$A1,$L1  # a[0]*w low part       r2
-        addq    $16,16,$16
-        addq    $17,8,$17
-        subq    $18,1,$18
-        umulh   $A1,$A1,$R1  # a[0]*w high part       r3
-        stq     $L1,-16($16)   # r[0]
-        stq     $R1,-8($16)   # r[1]
-
-        bgt     $18,$442
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$543:
-        addq    $18,4,$18
-        bgt     $18,$442        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sqr_words
-
-        .align 3
-        .globl bn_add_words
-        .ent bn_add_words
-bn_add_words:
-bn_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$CC     # carry = 0
-        blt     $19,$900
-        ldq     $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-        .align 3
-$901:
-        addq    $R1,$L1,$R1     # r=a+b;
-         ldq    $L2,8($17)      # a[1]
-        cmpult  $R1,$L1,$O1     # did we overflow?
-         ldq    $R2,8($18)      # b[1]
-        addq    $R1,$CC,$R1     # c+= overflow
-         ldq    $L3,16($17)     # a[2]
-        cmpult  $R1,$CC,$CC     # overflow?
-         ldq    $R3,16($18)     # b[2]
-        addq    $CC,$O1,$CC
-         ldq    $L4,24($17)     # a[3]
-        addq    $R2,$L2,$R2     # r=a+b;
-         ldq    $R4,24($18)     # b[3]
-        cmpult  $R2,$L2,$O2     # did we overflow?
-         addq   $R3,$L3,$R3     # r=a+b;
-        addq    $R2,$CC,$R2     # c+= overflow
-         cmpult $R3,$L3,$O3     # did we overflow?
-        cmpult  $R2,$CC,$CC     # overflow?
-         addq   $R4,$L4,$R4     # r=a+b;
-        addq    $CC,$O2,$CC
-         cmpult $R4,$L4,$O4     # did we overflow?
-        addq    $R3,$CC,$R3     # c+= overflow
-         stq    $R1,0($16)      # r[0]=c
-        cmpult  $R3,$CC,$CC     # overflow?
-         stq    $R2,8($16)      # r[1]=c
-        addq    $CC,$O3,$CC
-         stq    $R3,16($16)     # r[2]=c
-        addq    $R4,$CC,$R4     # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $R4,$CC,$CC     # overflow?
-         addq   $17,32,$17      # a++
-        addq    $CC,$O4,$CC
-         stq    $R4,24($16)     # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$900
-         ldq    $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-         br     $901
-        .align 4
-$945:
-        ldq     $L1,0($17)      # a[0]
-         ldq    $R1,0($18)      # b[1]
-        addq    $R1,$L1,$R1     # r=a+b;
-         subq   $19,1,$19       # loop--
-        addq    $R1,$CC,$R1     # c+= overflow
-         addq   $17,8,$17       # a++
-        cmpult  $R1,$L1,$O1     # did we overflow?
-         cmpult $R1,$CC,$CC     # overflow?
-        addq    $18,8,$18       # b++
-         stq    $R1,0($16)      # r[0]=c
-        addq    $CC,$O1,$CC
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$945
-        ret     $31,($26),1     # else exit
-
-$900:
-        addq    $19,4,$19
-        bgt     $19,$945        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_add_words
-
-        .align 3
-        .globl bn_sub_words
-        .ent bn_sub_words
-bn_sub_words:
-bn_sub_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$CC     # carry = 0
- br     $800
-        blt     $19,$800
-        ldq     $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-        .align 3
-$801:
-        addq    $R1,$L1,$R1     # r=a+b;
-         ldq    $L2,8($17)      # a[1]
-        cmpult  $R1,$L1,$O1     # did we overflow?
-         ldq    $R2,8($18)      # b[1]
-        addq    $R1,$CC,$R1     # c+= overflow
-         ldq    $L3,16($17)     # a[2]
-        cmpult  $R1,$CC,$CC     # overflow?
-         ldq    $R3,16($18)     # b[2]
-        addq    $CC,$O1,$CC
-         ldq    $L4,24($17)     # a[3]
-        addq    $R2,$L2,$R2     # r=a+b;
-         ldq    $R4,24($18)     # b[3]
-        cmpult  $R2,$L2,$O2     # did we overflow?
-         addq   $R3,$L3,$R3     # r=a+b;
-        addq    $R2,$CC,$R2     # c+= overflow
-         cmpult $R3,$L3,$O3     # did we overflow?
-        cmpult  $R2,$CC,$CC     # overflow?
-         addq   $R4,$L4,$R4     # r=a+b;
-        addq    $CC,$O2,$CC
-         cmpult $R4,$L4,$O4     # did we overflow?
-        addq    $R3,$CC,$R3     # c+= overflow
-         stq    $R1,0($16)      # r[0]=c
-        cmpult  $R3,$CC,$CC     # overflow?
-         stq    $R2,8($16)      # r[1]=c
-        addq    $CC,$O3,$CC
-         stq    $R3,16($16)     # r[2]=c
-        addq    $R4,$CC,$R4     # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $R4,$CC,$CC     # overflow?
-         addq   $17,32,$17      # a++
-        addq    $CC,$O4,$CC
-         stq    $R4,24($16)     # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$800
-         ldq    $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-         br     $801
-        .align 4
-$845:
-        ldq     $L1,0($17)      # a[0]
-         ldq    $R1,0($18)      # b[1]
-        cmpult  $L1,$R1,$O1     # will we borrow?
-         subq   $L1,$R1,$R1     # r=a-b;
-        subq    $19,1,$19       # loop--
-         cmpult  $R1,$CC,$O2    # will we borrow?
-        subq    $R1,$CC,$R1     # c+= overflow
-         addq   $17,8,$17       # a++
-        addq    $18,8,$18       # b++
-         stq    $R1,0($16)      # r[0]=c
-        addq    $O2,$O1,$CC
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$845
-        ret     $31,($26),1     # else exit
-
-$800:
-        addq    $19,4,$19
-        bgt     $19,$845        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sub_words
-
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .align 3
-        .globl bn_div_words
-        .ent bn_div_words
-bn_div_words:
-        ldgp $29,0($27)
-bn_div_words..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$119
-        lda $0,-1
-        br $31,$136
-        .align 4
-$119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$126
-        zapnot $7,15,$27
-        br $31,$127
-        .align 4
-$126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$127:
-        srl $10,32,$4
-        .align 5
-$128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$129
-        subq $27,1,$27
-        br $31,$128
-        .align 4
-$129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$134
-        addq $9,$11,$9
-        subq $27,1,$27
-$134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$123
-        .align 4
-$124:
-        bis $13,$27,$0
-$136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div_words
-EOF
-        return($data);
-        }
-
diff --git a/src/lib/libcrypto/bn/asm/ca.pl b/src/lib/libcrypto/bn/asm/ca.pl
deleted file mode 100644
index c1ce67a6b4..0000000000
--- a/src/lib/libcrypto/bn/asm/ca.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/local/bin/perl
-# I have this in perl so I can use more usefull register names and then convert
-# them into alpha registers.
-#
-
-push(@INC,"perlasm","../../perlasm");
-require "alpha.pl";
-require "alpha/mul_add.pl";
-require "alpha/mul.pl";
-require "alpha/sqr.pl";
-require "alpha/add.pl";
-require "alpha/sub.pl";
-require "alpha/mul_c8.pl";
-require "alpha/mul_c4.pl";
-require "alpha/sqr_c4.pl";
-require "alpha/sqr_c8.pl";
-require "alpha/div.pl";
-
-&asm_init($ARGV[0],$0);
-
-&bn_mul_words("bn_mul_words");
-&bn_sqr_words("bn_sqr_words");
-&bn_mul_add_words("bn_mul_add_words");
-&bn_add_words("bn_add_words");
-&bn_sub_words("bn_sub_words");
-&bn_div_words("bn_div_words");
-&bn_mul_comba8("bn_mul_comba8");
-&bn_mul_comba4("bn_mul_comba4");
-&bn_sqr_comba4("bn_sqr_comba4");
-&bn_sqr_comba8("bn_sqr_comba8");
-
-&asm_finish();
-
diff --git a/src/lib/libcrypto/bn/asm/co-alpha.pl b/src/lib/libcrypto/bn/asm/co-alpha.pl
deleted file mode 100644
index 67dad3e3d5..0000000000
--- a/src/lib/libcrypto/bn/asm/co-alpha.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/local/bin/perl
-# I have this in perl so I can use more usefull register names and then convert
-# them into alpha registers.
-#
-
-push(@INC,"perlasm","../../perlasm");
-require "alpha.pl";
-
-&asm_init($ARGV[0],$0);
-
-print &bn_sub_words("bn_sub_words");
-
-&asm_finish();
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        $cc="r0";
-        $a0="r1"; $b0="r5"; $r0="r9";  $tmp="r13";
-        $a1="r2"; $b1="r6"; $r1="r10"; $t1="r14";
-        $a2="r3"; $b2="r7"; $r2="r11";
-        $a3="r4"; $b3="r8"; $r3="r12"; $t3="r15";
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        &ld($a1,&QWPw(1,$ap));
-         &cmpult($a0,$b0,$tmp); # will we borrow?
-        &ld($b1,&QWPw(1,$bp));
-         &sub($a0,$b0,$a0);             # do the subtract
-        &ld($a2,&QWPw(2,$ap));
-         &cmpult($a0,$cc,$b0);  # will we borrow?
-        &ld($b2,&QWPw(2,$bp));
-         &sub($a0,$cc,$a0);     # will we borrow?
-        &ld($a3,&QWPw(3,$ap));
-         &add($b0,$tmp,$cc);    # add the borrows
-
-        &cmpult($a1,$b1,$t1);   # will we borrow?
-         &sub($a1,$b1,$a1);     # do the subtract
-        &ld($b3,&QWPw(3,$bp));
-         &cmpult($a1,$cc,$b1);  # will we borrow?
-        &sub($a1,$cc,$a1);      # will we borrow?
-         &add($b1,$t1,$cc);     # add the borrows
-
-        &cmpult($a2,$b2,$tmp);  # will we borrow?
-         &sub($a2,$b2,$a2);             # do the subtract
-        &st($a0,&QWPw(0,$rp));  # save
-         &cmpult($a2,$cc,$b2);  # will we borrow?
-        &sub($a2,$cc,$a2);      # will we borrow?
-         &add($b2,$tmp,$cc);    # add the borrows
-
-        &cmpult($a3,$b3,$t3);   # will we borrow?
-         &sub($a3,$b3,$a3);             # do the subtract
-        &st($a1,&QWPw(1,$rp));  # save
-         &cmpult($a3,$cc,$b3);  # will we borrow?
-        &sub($a3,$cc,$a3);      # will we borrow?
-         &add($b3,$t3,$cc);     # add the borrows
-
-        &st($a2,&QWPw(2,$rp));  # save
-         &sub($count,4,$count); # count-=4
-        &st($a3,&QWPw(3,$rp));  # save
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &cmpult($a0,$b0,$tmp);  # will we borrow?
-        &sub($a0,$b0,$a0);      # do the subtract
-        &cmpult($a0,$cc,$b0);   # will we borrow?
-        &sub($a0,$cc,$a0);      # will we borrow?
-        &st($a0,&QWPw(0,$rp));  # save
-        &add($b0,$tmp,$cc);     # add the borrows
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-        }
-
diff --git a/src/lib/libcrypto/bn/asm/mips1.s b/src/lib/libcrypto/bn/asm/mips1.s
deleted file mode 100644
index 44fa1254c7..0000000000
--- a/src/lib/libcrypto/bn/asm/mips1.s
+++ /dev/null
@@ -1,539 +0,0 @@
-/* This assember is for R2000/R3000 machines, or higher ones that do
- * no want to do any 64 bit arithmatic.
- * Make sure that the SSLeay bignum library is compiled with 
- * THIRTY_TWO_BIT set.
- * This must either be compiled with the system CC, or, if you use GNU gas,
- * cc -E mips1.s|gas -o mips1.o
- */
-        .set    reorder
-        .set    noat
-
-#define R1      $1
-#define CC      $2
-#define R2      $3
-#define R3      $8
-#define R4      $9
-#define L1      $10
-#define L2      $11
-#define L3      $12
-#define L4      $13
-#define H1      $14
-#define H2      $15
-#define H3      $24
-#define H4      $25
-
-#define P1      $4
-#define P2      $5
-#define P3      $6
-#define P4      $7
-
-        .align  2
-        .ent    bn_mul_add_words
-        .globl  bn_mul_add_words
-.text
-bn_mul_add_words:
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-
-        #blt    P3,4,$lab34
-        
-        subu    R1,P3,4
-        move    CC,$0
-        bltz    R1,$lab34
-$lab2:  
-        lw      R1,0(P1)
-         lw     L1,0(P2)
-        lw      R2,4(P1)
-         lw     L2,4(P2)
-        lw      R3,8(P1)
-         lw     L3,8(P2)
-        lw      R4,12(P1)
-         lw     L4,12(P2)
-        multu   L1,P4
-         addu   R1,R1,CC
-        mflo    L1
-         sltu   CC,R1,CC
-        addu    R1,R1,L1
-         mfhi   H1
-        sltu    L1,R1,L1
-         sw     R1,0(P1)
-        addu    CC,CC,L1
-         multu  L2,P4
-        addu    CC,H1,CC
-        mflo    L2
-         addu   R2,R2,CC
-        sltu    CC,R2,CC
-         mfhi   H2
-        addu    R2,R2,L2
-         addu   P2,P2,16
-        sltu    L2,R2,L2
-         sw     R2,4(P1)
-        addu    CC,CC,L2
-         multu  L3,P4
-        addu    CC,H2,CC
-        mflo    L3
-         addu   R3,R3,CC
-        sltu    CC,R3,CC
-         mfhi   H3
-        addu    R3,R3,L3
-         addu   P1,P1,16
-        sltu    L3,R3,L3
-         sw     R3,-8(P1)
-        addu    CC,CC,L3
-         multu  L4,P4
-        addu    CC,H3,CC
-        mflo    L4
-         addu   R4,R4,CC
-        sltu    CC,R4,CC
-         mfhi   H4
-        addu    R4,R4,L4
-         subu   P3,P3,4
-        sltu    L4,R4,L4
-        addu    CC,CC,L4
-        addu    CC,H4,CC
-
-        subu    R1,P3,4
-        sw      R4,-4(P1)       # delay slot
-        bgez    R1,$lab2
-
-        bleu    P3,0,$lab3
-        .align  2
-$lab33: 
-        lw      L1,0(P2)
-         lw     R1,0(P1)
-        multu   L1,P4
-         addu   R1,R1,CC
-        sltu    CC,R1,CC
-         addu   P1,P1,4
-        mflo    L1
-         mfhi   H1
-        addu    R1,R1,L1
-         addu   P2,P2,4
-        sltu    L1,R1,L1
-         subu   P3,P3,1
-        addu    CC,CC,L1
-         sw     R1,-4(P1)
-        addu    CC,H1,CC
-         bgtz   P3,$lab33
-        j       $31
-        .align  2
-$lab3:
-        j       $31
-        .align  2
-$lab34:
-        bgt     P3,0,$lab33
-        j       $31
-        .end    bn_mul_add_words
-
-        .align  2
-        # Program Unit: bn_mul_words
-        .ent    bn_mul_words
-        .globl  bn_mul_words
-.text
-bn_mul_words:
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        
-        subu    P3,P3,4
-        move    CC,$0
-        bltz    P3,$lab45
-$lab44: 
-        lw      L1,0(P2)
-         lw     L2,4(P2)
-        lw      L3,8(P2)
-         lw     L4,12(P2)
-        multu   L1,P4
-         subu   P3,P3,4
-        mflo    L1
-         mfhi   H1
-        addu    L1,L1,CC
-         multu  L2,P4
-        sltu    CC,L1,CC
-         sw     L1,0(P1)
-        addu    CC,H1,CC
-         mflo   L2
-        mfhi    H2
-         addu   L2,L2,CC
-        multu   L3,P4
-         sltu   CC,L2,CC
-        sw      L2,4(P1)
-         addu   CC,H2,CC
-        mflo    L3
-         mfhi   H3
-        addu    L3,L3,CC
-         multu  L4,P4
-        sltu    CC,L3,CC
-         sw     L3,8(P1)
-        addu    CC,H3,CC
-         mflo   L4
-        mfhi    H4
-         addu   L4,L4,CC
-        addu    P1,P1,16
-         sltu   CC,L4,CC
-        addu    P2,P2,16
-         addu   CC,H4,CC
-        sw      L4,-4(P1)
-
-        bgez    P3,$lab44
-        b       $lab45
-$lab46:
-        lw      L1,0(P2)
-         addu   P1,P1,4
-        multu   L1,P4
-         addu   P2,P2,4
-        mflo    L1
-         mfhi   H1
-        addu    L1,L1,CC
-         subu   P3,P3,1
-        sltu    CC,L1,CC
-         sw     L1,-4(P1)
-        addu    CC,H1,CC
-         bgtz   P3,$lab46
-        j       $31
-$lab45:
-        addu    P3,P3,4
-        bgtz    P3,$lab46
-        j       $31
-        .align  2
-        .end    bn_mul_words
-
-        # Program Unit: bn_sqr_words
-        .ent    bn_sqr_words
-        .globl  bn_sqr_words
-.text
-bn_sqr_words:
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        
-        subu    P3,P3,4
-        bltz    P3,$lab55
-$lab54:
-        lw      L1,0(P2)
-         lw     L2,4(P2)
-        lw      L3,8(P2)
-         lw     L4,12(P2)
-
-        multu   L1,L1
-         subu   P3,P3,4
-        mflo    L1
-         mfhi   H1
-        sw      L1,0(P1)
-         sw     H1,4(P1)
-
-        multu   L2,L2
-         addu   P1,P1,32
-        mflo    L2
-         mfhi   H2
-        sw      L2,-24(P1)
-         sw     H2,-20(P1)
-
-        multu   L3,L3
-         addu   P2,P2,16
-        mflo    L3
-         mfhi   H3
-        sw      L3,-16(P1)
-         sw     H3,-12(P1)
-
-        multu   L4,L4
-
-        mflo    L4
-         mfhi   H4
-        sw      L4,-8(P1)
-         sw     H4,-4(P1)
-
-        bgtz    P3,$lab54
-        b       $lab55
-$lab56: 
-        lw      L1,0(P2)
-        addu    P1,P1,8
-        multu   L1,L1
-        addu    P2,P2,4
-        subu    P3,P3,1
-        mflo    L1
-        mfhi    H1
-        sw      L1,-8(P1)
-        sw      H1,-4(P1)
-
-        bgtz    P3,$lab56
-        j       $31
-$lab55:
-        addu    P3,P3,4
-        bgtz    P3,$lab56
-        j       $31
-        .align  2
-        .end    bn_sqr_words
-
-        # Program Unit: bn_add_words
-        .ent    bn_add_words
-        .globl  bn_add_words
-.text
-bn_add_words:    # 0x590
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        
-        subu    P4,P4,4
-        move    CC,$0
-        bltz    P4,$lab65
-$lab64: 
-        lw      L1,0(P2)
-        lw      R1,0(P3)
-        lw      L2,4(P2)
-        lw      R2,4(P3)
-
-        addu    L1,L1,CC
-         lw     L3,8(P2)
-        sltu    CC,L1,CC
-         addu   L1,L1,R1
-        sltu    R1,L1,R1
-         lw     R3,8(P3)
-        addu    CC,CC,R1
-         lw     L4,12(P2)
-
-        addu    L2,L2,CC
-         lw     R4,12(P3)
-        sltu    CC,L2,CC
-         addu   L2,L2,R2
-        sltu    R2,L2,R2
-         sw     L1,0(P1)
-        addu    CC,CC,R2
-         addu   P1,P1,16
-        addu    L3,L3,CC
-         sw     L2,-12(P1)
- 
-        sltu    CC,L3,CC
-         addu   L3,L3,R3
-        sltu    R3,L3,R3
-         addu   P2,P2,16
-        addu    CC,CC,R3
-
-        addu    L4,L4,CC
-         addu   P3,P3,16
-        sltu    CC,L4,CC
-         addu   L4,L4,R4
-        subu    P4,P4,4
-         sltu   R4,L4,R4
-        sw      L3,-8(P1)
-         addu   CC,CC,R4
-        sw      L4,-4(P1)
-
-        bgtz    P4,$lab64
-        b       $lab65
-$lab66:
-        lw      L1,0(P2)
-         lw     R1,0(P3)
-        addu    L1,L1,CC
-         addu   P1,P1,4
-        sltu    CC,L1,CC
-         addu   P2,P2,4
-        addu    P3,P3,4
-         addu   L1,L1,R1
-        subu    P4,P4,1
-         sltu   R1,L1,R1
-        sw      L1,-4(P1)
-         addu   CC,CC,R1
-
-        bgtz    P4,$lab66
-        j       $31
-$lab65:
-        addu    P4,P4,4
-        bgtz    P4,$lab66
-        j       $31
-        .end    bn_add_words
-
-        # Program Unit: bn_div64
-        .set    at
-        .set    reorder
-        .text   
-        .align  2
-        .globl  bn_div64
- # 321          {
-        .ent    bn_div64 2
-bn_div64:
-        subu    $sp, 64
-        sw      $31, 56($sp)
-        sw      $16, 48($sp)
-        .mask   0x80010000, -56
-        .frame  $sp, 64, $31
-        move    $9, $4
-        move    $12, $5
-        move    $16, $6
- # 322          BN_ULONG dh,dl,q,ret=0,th,tl,t;
-        move    $31, $0
- # 323          int i,count=2;
-        li      $13, 2
- # 324  
- # 325          if (d == 0) return(BN_MASK2);
-        bne     $16, 0, $80
-        li      $2, -1
-        b       $93
-$80:
- # 326  
- # 327          i=BN_num_bits_word(d);
-        move    $4, $16
-        sw      $31, 16($sp)
-        sw      $9, 24($sp)
-        sw      $12, 32($sp)
-        sw      $13, 40($sp)
-        .livereg        0x800ff0e,0xfff
-        jal     BN_num_bits_word
-        li      $4, 32
-        lw      $31, 16($sp)
-        lw      $9, 24($sp)
-        lw      $12, 32($sp)
-        lw      $13, 40($sp)
-        move    $3, $2
- # 328          if ((i != BN_BITS2) && (h > (BN_ULONG)1<<i))
-        beq     $2, $4, $81
-        li      $14, 1
-        sll     $15, $14, $2
-        bleu    $9, $15, $81
- # 329                  {
- # 330  #if !defined(NO_STDIO) && !defined(WIN16)
- # 331                  fprintf(stderr,"Division would overflow (%d)\n",i);
- # 332  #endif
- # 333                  abort();
-        sw      $3, 8($sp)
-        sw      $9, 24($sp)
-        sw      $12, 32($sp)
-        sw      $13, 40($sp)
-        sw      $31, 26($sp)
-        .livereg        0xff0e,0xfff
-        jal     abort
-        lw      $3, 8($sp)
-        li      $4, 32
-        lw      $9, 24($sp)
-        lw      $12, 32($sp)
-        lw      $13, 40($sp)
-        lw      $31, 26($sp)
- # 334                  }
-$81:
- # 335          i=BN_BITS2-i;
-        subu    $3, $4, $3
- # 336          if (h >= d) h-=d;
-        bltu    $9, $16, $82
-        subu    $9, $9, $16
-$82:
- # 337  
- # 338          if (i)
-        beq     $3, 0, $83
- # 339                  {
- # 340                  d<<=i;
-        sll     $16, $16, $3
- # 341                  h=(h<<i)|(l>>(BN_BITS2-i));
-        sll     $24, $9, $3
-        subu    $25, $4, $3
-        srl     $14, $12, $25
-        or      $9, $24, $14
- # 342                  l<<=i;
-        sll     $12, $12, $3
- # 343                  }
-$83:
- # 344          dh=(d&BN_MASK2h)>>BN_BITS4;
- # 345          dl=(d&BN_MASK2l);
-        and     $8, $16, -65536
-        srl     $8, $8, 16
-        and     $10, $16, 65535
-        li      $6, -65536
-$84:
- # 346          for (;;)
- # 347                  {
- # 348                  if ((h>>BN_BITS4) == dh)
-        srl     $15, $9, 16
-        bne     $8, $15, $85
- # 349                          q=BN_MASK2l;
-        li      $5, 65535
-        b       $86
-$85:
- # 350                  else
- # 351                          q=h/dh;
-        divu    $5, $9, $8
-$86:
- # 352  
- # 353                  for (;;)
- # 354                          {
- # 355                          t=(h-q*dh);
-        mul     $4, $5, $8
-        subu    $2, $9, $4
-        move    $3, $2
- # 356                          if ((t&BN_MASK2h) ||
- # 357                                  ((dl*q) <= (
- # 358                                          (t<<BN_BITS4)+
- # 359                                          ((l&BN_MASK2h)>>BN_BITS4))))
-        and     $25, $2, $6
-        bne     $25, $0, $87
-        mul     $24, $10, $5
-        sll     $14, $3, 16
-        and     $15, $12, $6
-        srl     $25, $15, 16
-        addu    $15, $14, $25
-        bgtu    $24, $15, $88
-$87:
- # 360                                  break;
-        mul     $3, $10, $5
-        b       $89
-$88:
- # 361                          q--;
-        addu    $5, $5, -1
- # 362                          }
-        b       $86
-$89:
- # 363                  th=q*dh;
- # 364                  tl=q*dl;
- # 365                  t=(tl>>BN_BITS4);
- # 366                  tl=(tl<<BN_BITS4)&BN_MASK2h;
-        sll     $14, $3, 16
-        and     $2, $14, $6
-        move    $11, $2
- # 367                  th+=t;
-        srl     $25, $3, 16
-        addu    $7, $4, $25
- # 368  
- # 369                  if (l < tl) th++;
-        bgeu    $12, $2, $90
-        addu    $7, $7, 1
-$90:
- # 370                  l-=tl;
-        subu    $12, $12, $11
- # 371                  if (h < th)
-        bgeu    $9, $7, $91
- # 372                          {
- # 373                          h+=d;
-        addu    $9, $9, $16
- # 374                          q--;
-        addu    $5, $5, -1
- # 375                          }
-$91:
- # 376                  h-=th;
-        subu    $9, $9, $7
- # 377  
- # 378                  if (--count == 0) break;
-        addu    $13, $13, -1
-        beq     $13, 0, $92
- # 379  
- # 380                  ret=q<<BN_BITS4;
-        sll     $31, $5, 16
- # 381                  h=((h<<BN_BITS4)|(l>>BN_BITS4))&BN_MASK2;
-        sll     $24, $9, 16
-        srl     $15, $12, 16
-        or      $9, $24, $15
- # 382                  l=(l&BN_MASK2l)<<BN_BITS4;
-        and     $12, $12, 65535
-        sll     $12, $12, 16
- # 383                  }
-        b       $84
-$92:
- # 384          ret|=q;
-        or      $31, $31, $5
- # 385          return(ret);
-        move    $2, $31
-$93:
-        lw      $16, 48($sp)
-        lw      $31, 56($sp)
-        addu    $sp, 64
-        j       $31
-        .end    bn_div64
-
diff --git a/src/lib/libcrypto/bn/asm/mips3-mont.pl b/src/lib/libcrypto/bn/asm/mips3-mont.pl
new file mode 100644
index 0000000000..8f9156e02a
--- /dev/null
+++ b/src/lib/libcrypto/bn/asm/mips3-mont.pl
@@ -0,0 +1,327 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. The module is, however, dual licensed under OpenSSL and
+# CRYPTOGAMS licenses depending on where you obtain it. For further
+# details see http://www.openssl.org/~appro/cryptogams/.
+# ====================================================================
+
+# This module doesn't present direct interest for OpenSSL, because it
+# doesn't provide better performance for longer keys. While 512-bit
+# RSA private key operations are 40% faster, 1024-bit ones are hardly
+# faster at all, while longer key operations are slower by up to 20%.
+# It might be of interest to embedded system developers though, as
+# it's smaller than 1KB, yet offers ~3x improvement over compiler
+# generated code.
+#
+# The module targets N32 and N64 MIPS ABIs and currently is a bit
+# IRIX-centric, i.e. is likely to require adaptation for other OSes.
+
+# int bn_mul_mont(
+$rp="a0";       # BN_ULONG *rp,
+$ap="a1";       # const BN_ULONG *ap,
+$bp="a2";       # const BN_ULONG *bp,
+$np="a3";       # const BN_ULONG *np,
+$n0="a4";       # const BN_ULONG *n0,
+$num="a5";      # int num);
+
+$lo0="a6";
+$hi0="a7";
+$lo1="v0";
+$hi1="v1";
+$aj="t0";
+$bi="t1";
+$nj="t2";
+$tp="t3";
+$alo="s0";
+$ahi="s1";
+$nlo="s2";
+$nhi="s3";
+$tj="s4";
+$i="s5";
+$j="s6";
+$fp="t8";
+$m1="t9";
+
+$FRAME=8*(2+8);
+
+$code=<<___;
+#include <asm.h>
+#include <regdef.h>
+
+.text
+
+.set    noat
+.set    reorder
+
+.align  5
+.globl  bn_mul_mont
+.ent    bn_mul_mont
+bn_mul_mont:
+        .set    noreorder
+        PTR_SUB sp,64
+        move    $fp,sp
+        .frame  $fp,64,ra
+        slt     AT,$num,4
+        li      v0,0
+        beqzl   AT,.Lproceed
+        nop
+        jr      ra
+        PTR_ADD sp,$fp,64
+        .set    reorder
+.align  5
+.Lproceed:
+        ld      $n0,0($n0)
+        ld      $bi,0($bp)      # bp[0]
+        ld      $aj,0($ap)      # ap[0]
+        ld      $nj,0($np)      # np[0]
+        PTR_SUB sp,16           # place for two extra words
+        sll     $num,3
+        li      AT,-4096
+        PTR_SUB sp,$num
+        and     sp,AT
+
+        sd      s0,0($fp)
+        sd      s1,8($fp)
+        sd      s2,16($fp)
+        sd      s3,24($fp)
+        sd      s4,32($fp)
+        sd      s5,40($fp)
+        sd      s6,48($fp)
+        sd      s7,56($fp)
+
+        dmultu  $aj,$bi
+        ld      $alo,8($ap)
+        ld      $nlo,8($np)
+        mflo    $lo0
+        mfhi    $hi0
+        dmultu  $lo0,$n0
+        mflo    $m1
+
+        dmultu  $alo,$bi
+        mflo    $alo
+        mfhi    $ahi
+
+        dmultu  $nj,$m1
+        mflo    $lo1
+        mfhi    $hi1
+        dmultu  $nlo,$m1
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        daddu   $hi1,AT
+        mflo    $nlo
+        mfhi    $nhi
+
+        move    $tp,sp
+        li      $j,16
+.align  4
+.L1st:
+        .set    noreorder
+        PTR_ADD $aj,$ap,$j
+        ld      $aj,($aj)
+        PTR_ADD $nj,$np,$j
+        ld      $nj,($nj)
+
+        dmultu  $aj,$bi
+        daddu   $lo0,$alo,$hi0
+        daddu   $lo1,$nlo,$hi1
+        sltu    AT,$lo0,$hi0
+        sltu    s7,$lo1,$hi1
+        daddu   $hi0,$ahi,AT
+        daddu   $hi1,$nhi,s7
+        mflo    $alo
+        mfhi    $ahi
+
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        dmultu  $nj,$m1
+        daddu   $hi1,AT
+        addu    $j,8
+        sd      $lo1,($tp)
+        sltu    s7,$j,$num
+        mflo    $nlo
+        mfhi    $nhi
+
+        bnez    s7,.L1st
+        PTR_ADD $tp,8
+        .set    reorder
+
+        daddu   $lo0,$alo,$hi0
+        sltu    AT,$lo0,$hi0
+        daddu   $hi0,$ahi,AT
+
+        daddu   $lo1,$nlo,$hi1
+        sltu    s7,$lo1,$hi1
+        daddu   $hi1,$nhi,s7
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        daddu   $hi1,AT
+
+        sd      $lo1,($tp)
+
+        daddu   $hi1,$hi0
+        sltu    AT,$hi1,$hi0
+        sd      $hi1,8($tp)
+        sd      AT,16($tp)
+
+        li      $i,8
+.align  4
+.Louter:
+        PTR_ADD $bi,$bp,$i
+        ld      $bi,($bi)
+        ld      $aj,($ap)
+        ld      $alo,8($ap)
+        ld      $tj,(sp)
+
+        dmultu  $aj,$bi
+        ld      $nj,($np)
+        ld      $nlo,8($np)
+        mflo    $lo0
+        mfhi    $hi0
+        daddu   $lo0,$tj
+        dmultu  $lo0,$n0
+        sltu    AT,$lo0,$tj
+        daddu   $hi0,AT
+        mflo    $m1
+
+        dmultu  $alo,$bi
+        mflo    $alo
+        mfhi    $ahi
+
+        dmultu  $nj,$m1
+        mflo    $lo1
+        mfhi    $hi1
+
+        dmultu  $nlo,$m1
+        daddu   $lo1,$lo0
+        sltu    AT,$lo1,$lo0
+        daddu   $hi1,AT
+        mflo    $nlo
+        mfhi    $nhi
+
+        move    $tp,sp
+        li      $j,16
+        ld      $tj,8($tp)
+.align  4
+.Linner:
+        .set    noreorder
+        PTR_ADD $aj,$ap,$j
+        ld      $aj,($aj)
+        PTR_ADD $nj,$np,$j
+        ld      $nj,($nj)
+
+        dmultu  $aj,$bi
+        daddu   $lo0,$alo,$hi0
+        daddu   $lo1,$nlo,$hi1
+        sltu    AT,$lo0,$hi0
+        sltu    s7,$lo1,$hi1
+        daddu   $hi0,$ahi,AT
+        daddu   $hi1,$nhi,s7
+        mflo    $alo
+        mfhi    $ahi
+
+        daddu   $lo0,$tj
+        addu    $j,8
+        dmultu  $nj,$m1
+        sltu    AT,$lo0,$tj
+        daddu   $lo1,$lo0
+        daddu   $hi0,AT
+        sltu    s7,$lo1,$lo0
+        ld      $tj,16($tp)
+        daddu   $hi1,s7
+        sltu    AT,$j,$num
+        mflo    $nlo
+        mfhi    $nhi
+        sd      $lo1,($tp)
+        bnez    AT,.Linner
+        PTR_ADD $tp,8
+        .set    reorder
+
+        daddu   $lo0,$alo,$hi0
+        sltu    AT,$lo0,$hi0
+        daddu   $hi0,$ahi,AT
+        daddu   $lo0,$tj
+        sltu    s7,$lo0,$tj
+        daddu   $hi0,s7
+
+        ld      $tj,16($tp)
+        daddu   $lo1,$nlo,$hi1
+        sltu    AT,$lo1,$hi1
+        daddu   $hi1,$nhi,AT
+        daddu   $lo1,$lo0
+        sltu    s7,$lo1,$lo0
+        daddu   $hi1,s7
+        sd      $lo1,($tp)
+
+        daddu   $lo1,$hi1,$hi0
+        sltu    $hi1,$lo1,$hi0
+        daddu   $lo1,$tj
+        sltu    AT,$lo1,$tj
+        daddu   $hi1,AT
+        sd      $lo1,8($tp)
+        sd      $hi1,16($tp)
+
+        addu    $i,8
+        sltu    s7,$i,$num
+        bnez    s7,.Louter
+
+        .set    noreorder
+        PTR_ADD $tj,sp,$num     # &tp[num]
+        move    $tp,sp
+        move    $ap,sp
+        li      $hi0,0          # clear borrow bit
+
+.align  4
+.Lsub:  ld      $lo0,($tp)
+        ld      $lo1,($np)
+        PTR_ADD $tp,8
+        PTR_ADD $np,8
+        dsubu   $lo1,$lo0,$lo1  # tp[i]-np[i]
+        sgtu    AT,$lo1,$lo0
+        dsubu   $lo0,$lo1,$hi0
+        sgtu    $hi0,$lo0,$lo1
+        sd      $lo0,($rp)
+        or      $hi0,AT
+        sltu    AT,$tp,$tj
+        bnez    AT,.Lsub
+        PTR_ADD $rp,8
+
+        dsubu   $hi0,$hi1,$hi0  # handle upmost overflow bit
+        move    $tp,sp
+        PTR_SUB $rp,$num        # restore rp
+        not     $hi1,$hi0
+
+        and     $ap,$hi0,sp
+        and     $bp,$hi1,$rp
+        or      $ap,$ap,$bp     # ap=borrow?tp:rp
+
+.align  4
+.Lcopy: ld      $aj,($ap)
+        PTR_ADD $ap,8
+        PTR_ADD $tp,8
+        sd      zero,-8($tp)
+        sltu    AT,$tp,$tj
+        sd      $aj,($rp)
+        bnez    AT,.Lcopy
+        PTR_ADD $rp,8
+
+        ld      s0,0($fp)
+        ld      s1,8($fp)
+        ld      s2,16($fp)
+        ld      s3,24($fp)
+        ld      s4,32($fp)
+        ld      s5,40($fp)
+        ld      s6,48($fp)
+        ld      s7,56($fp)
+        li      v0,1
+        jr      ra
+        PTR_ADD sp,$fp,64
+        .set    reorder
+END(bn_mul_mont)
+.rdata
+.asciiz "Montgomery Multiplication for MIPS III/IV, CRYPTOGAMS by <appro\@openssl.org>"
+___
+
+print $code;
+close STDOUT;
diff --git a/src/lib/libcrypto/bn/asm/mo-586.pl b/src/lib/libcrypto/bn/asm/mo-586.pl
deleted file mode 100644
index 0982293094..0000000000
--- a/src/lib/libcrypto/bn/asm/mo-586.pl
+++ /dev/null
@@ -1,603 +0,0 @@
-#!/usr/bin/env perl
-
-# This is crypto/bn/asm/x86-mont.pl (with asciz from crypto/perlasm/x86asm.pl)
-# from OpenSSL 0.9.9-dev 
-
-sub ::asciz
-{ my @str=unpack("C*",shift);
-    push @str,0;
-    while ($#str>15) {
-        &data_byte(@str[0..15]);
-        foreach (0..15) { shift @str; }
-    }
-    &data_byte(@str) if (@str);
-}
-
-# ====================================================================
-# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
-# project. The module is, however, dual licensed under OpenSSL and
-# CRYPTOGAMS licenses depending on where you obtain it. For further
-# details see http://www.openssl.org/~appro/cryptogams/.
-# ====================================================================
-
-# October 2005
-#
-# This is a "teaser" code, as it can be improved in several ways...
-# First of all non-SSE2 path should be implemented (yes, for now it
-# performs Montgomery multiplication/convolution only on SSE2-capable
-# CPUs such as P4, others fall down to original code). Then inner loop
-# can be unrolled and modulo-scheduled to improve ILP and possibly
-# moved to 128-bit XMM register bank (though it would require input
-# rearrangement and/or increase bus bandwidth utilization). Dedicated
-# squaring procedure should give further performance improvement...
-# Yet, for being draft, the code improves rsa512 *sign* benchmark by
-# 110%(!), rsa1024 one - by 70% and rsa4096 - by 20%:-)
-
-# December 2006
-#
-# Modulo-scheduling SSE2 loops results in further 15-20% improvement.
-# Integer-only code [being equipped with dedicated squaring procedure]
-# gives ~40% on rsa512 sign benchmark...
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],$0);
-
-$sse2=0;
-for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
-
-&external_label("OPENSSL_ia32cap_P") if ($sse2);
-
-&function_begin("bn_mul_mont");
-
-$i="edx";
-$j="ecx";
-$ap="esi";      $tp="esi";              # overlapping variables!!!
-$rp="edi";      $bp="edi";              # overlapping variables!!!
-$np="ebp";
-$num="ebx";
-
-$_num=&DWP(4*0,"esp");                  # stack top layout
-$_rp=&DWP(4*1,"esp");
-$_ap=&DWP(4*2,"esp");
-$_bp=&DWP(4*3,"esp");
-$_np=&DWP(4*4,"esp");
-$_n0=&DWP(4*5,"esp");   $_n0q=&QWP(4*5,"esp");
-$_sp=&DWP(4*6,"esp");
-$_bpend=&DWP(4*7,"esp");
-$frame=32;                              # size of above frame rounded up to 16n
-
-        &xor    ("eax","eax");
-        &mov    ("edi",&wparam(5));     # int num
-        &cmp    ("edi",4);
-        &jl     (&label("just_leave"));
-
-        &lea    ("esi",&wparam(0));     # put aside pointer to argument block
-        &lea    ("edx",&wparam(1));     # load ap
-        &mov    ("ebp","esp");          # saved stack pointer!
-        &add    ("edi",2);              # extra two words on top of tp
-        &neg    ("edi");
-        &lea    ("esp",&DWP(-$frame,"esp","edi",4));    # alloca($frame+4*(num+2))
-        &neg    ("edi");
-
-        # minimize cache contention by arraning 2K window between stack
-        # pointer and ap argument [np is also position sensitive vector,
-        # but it's assumed to be near ap, as it's allocated at ~same
-        # time].
-        &mov    ("eax","esp");
-        &sub    ("eax","edx");
-        &and    ("eax",2047);
-        &sub    ("esp","eax");          # this aligns sp and ap modulo 2048
-
-        &xor    ("edx","esp");
-        &and    ("edx",2048);
-        &xor    ("edx",2048);
-        &sub    ("esp","edx");          # this splits them apart modulo 4096
-
-        &and    ("esp",-64);            # align to cache line
-
-        ################################# load argument block...
-        &mov    ("eax",&DWP(0*4,"esi"));# BN_ULONG *rp
-        &mov    ("ebx",&DWP(1*4,"esi"));# const BN_ULONG *ap
-        &mov    ("ecx",&DWP(2*4,"esi"));# const BN_ULONG *bp
-        &mov    ("edx",&DWP(3*4,"esi"));# const BN_ULONG *np
-        &mov    ("esi",&DWP(4*4,"esi"));# const BN_ULONG *n0
-        #&mov   ("edi",&DWP(5*4,"esi"));# int num
-
-        &mov    ("esi",&DWP(0,"esi"));  # pull n0[0]
-        &mov    ($_rp,"eax");           # ... save a copy of argument block
-        &mov    ($_ap,"ebx");
-        &mov    ($_bp,"ecx");
-        &mov    ($_np,"edx");
-        &mov    ($_n0,"esi");
-        &lea    ($num,&DWP(-3,"edi"));  # num=num-1 to assist modulo-scheduling
-        #&mov   ($_num,$num);           # redundant as $num is not reused
-        &mov    ($_sp,"ebp");           # saved stack pointer!
-
-if($sse2) {
-$acc0="mm0";    # mmx register bank layout
-$acc1="mm1";
-$car0="mm2";
-$car1="mm3";
-$mul0="mm4";
-$mul1="mm5";
-$temp="mm6";
-$mask="mm7";
-
-        &picmeup("eax","OPENSSL_ia32cap_P");
-        &bt     (&DWP(0,"eax"),26);
-        &jnc    (&label("non_sse2"));
-
-        &mov    ("eax",-1);
-        &movd   ($mask,"eax");          # mask 32 lower bits
-
-        &mov    ($ap,$_ap);             # load input pointers
-        &mov    ($bp,$_bp);
-        &mov    ($np,$_np);
-
-        &xor    ($i,$i);                # i=0
-        &xor    ($j,$j);                # j=0
-
-        &movd   ($mul0,&DWP(0,$bp));            # bp[0]
-        &movd   ($mul1,&DWP(0,$ap));            # ap[0]
-        &movd   ($car1,&DWP(0,$np));            # np[0]
-
-        &pmuludq($mul1,$mul0);                  # ap[0]*bp[0]
-        &movq   ($car0,$mul1);
-        &movq   ($acc0,$mul1);                  # I wish movd worked for
-        &pand   ($acc0,$mask);                  # inter-register transfers
-
-        &pmuludq($mul1,$_n0q);                  # *=n0
-
-        &pmuludq($car1,$mul1);                  # "t[0]"*np[0]*n0
-        &paddq  ($car1,$acc0);
-
-        &movd   ($acc1,&DWP(4,$np));            # np[1]
-        &movd   ($acc0,&DWP(4,$ap));            # ap[1]
-
-        &psrlq  ($car0,32);
-        &psrlq  ($car1,32);
-
-        &inc    ($j);                           # j++
-&set_label("1st",16);
-        &pmuludq($acc0,$mul0);                  # ap[j]*bp[0]
-        &pmuludq($acc1,$mul1);                  # np[j]*m1
-        &paddq  ($car0,$acc0);                  # +=c0
-        &paddq  ($car1,$acc1);                  # +=c1
-
-        &movq   ($acc0,$car0);
-        &pand   ($acc0,$mask);
-        &movd   ($acc1,&DWP(4,$np,$j,4));       # np[j+1]
-        &paddq  ($car1,$acc0);                  # +=ap[j]*bp[0];
-        &movd   ($acc0,&DWP(4,$ap,$j,4));       # ap[j+1]
-        &psrlq  ($car0,32);
-        &movd   (&DWP($frame-4,"esp",$j,4),$car1);      # tp[j-1]=
-        &psrlq  ($car1,32);
-
-        &lea    ($j,&DWP(1,$j));
-        &cmp    ($j,$num);
-        &jl     (&label("1st"));
-
-        &pmuludq($acc0,$mul0);                  # ap[num-1]*bp[0]
-        &pmuludq($acc1,$mul1);                  # np[num-1]*m1
-        &paddq  ($car0,$acc0);                  # +=c0
-        &paddq  ($car1,$acc1);                  # +=c1
-
-        &movq   ($acc0,$car0);
-        &pand   ($acc0,$mask);
-        &paddq  ($car1,$acc0);                  # +=ap[num-1]*bp[0];
-        &movd   (&DWP($frame-4,"esp",$j,4),$car1);      # tp[num-2]=
-
-        &psrlq  ($car0,32);
-        &psrlq  ($car1,32);
-
-        &paddq  ($car1,$car0);
-        &movq   (&QWP($frame,"esp",$num,4),$car1);      # tp[num].tp[num-1]
-
-        &inc    ($i);                           # i++
-&set_label("outer");
-        &xor    ($j,$j);                        # j=0
-
-        &movd   ($mul0,&DWP(0,$bp,$i,4));       # bp[i]
-        &movd   ($mul1,&DWP(0,$ap));            # ap[0]
-        &movd   ($temp,&DWP($frame,"esp"));     # tp[0]
-        &movd   ($car1,&DWP(0,$np));            # np[0]
-        &pmuludq($mul1,$mul0);                  # ap[0]*bp[i]
-
-        &paddq  ($mul1,$temp);                  # +=tp[0]
-        &movq   ($acc0,$mul1);
-        &movq   ($car0,$mul1);
-        &pand   ($acc0,$mask);
-
-        &pmuludq($mul1,$_n0q);                  # *=n0
-
-        &pmuludq($car1,$mul1);
-        &paddq  ($car1,$acc0);
-
-        &movd   ($temp,&DWP($frame+4,"esp"));   # tp[1]
-        &movd   ($acc1,&DWP(4,$np));            # np[1]
-        &movd   ($acc0,&DWP(4,$ap));            # ap[1]
-
-        &psrlq  ($car0,32);
-        &psrlq  ($car1,32);
-        &paddq  ($car0,$temp);                  # +=tp[1]
-
-        &inc    ($j);                           # j++
-        &dec    ($num);
-&set_label("inner");
-        &pmuludq($acc0,$mul0);                  # ap[j]*bp[i]
-        &pmuludq($acc1,$mul1);                  # np[j]*m1
-        &paddq  ($car0,$acc0);                  # +=c0
-        &paddq  ($car1,$acc1);                  # +=c1
-
-        &movq   ($acc0,$car0);
-        &movd   ($temp,&DWP($frame+4,"esp",$j,4));# tp[j+1]
-        &pand   ($acc0,$mask);
-        &movd   ($acc1,&DWP(4,$np,$j,4));       # np[j+1]
-        &paddq  ($car1,$acc0);                  # +=ap[j]*bp[i]+tp[j]
-        &movd   ($acc0,&DWP(4,$ap,$j,4));       # ap[j+1]
-        &psrlq  ($car0,32);
-        &movd   (&DWP($frame-4,"esp",$j,4),$car1);# tp[j-1]=
-        &psrlq  ($car1,32);
-        &paddq  ($car0,$temp);                  # +=tp[j+1]
-
-        &dec    ($num);
-        &lea    ($j,&DWP(1,$j));                # j++
-        &jnz    (&label("inner"));
-
-        &mov    ($num,$j);
-        &pmuludq($acc0,$mul0);                  # ap[num-1]*bp[i]
-        &pmuludq($acc1,$mul1);                  # np[num-1]*m1
-        &paddq  ($car0,$acc0);                  # +=c0
-        &paddq  ($car1,$acc1);                  # +=c1
-
-        &movq   ($acc0,$car0);
-        &pand   ($acc0,$mask);
-        &paddq  ($car1,$acc0);                  # +=ap[num-1]*bp[i]+tp[num-1]
-        &movd   (&DWP($frame-4,"esp",$j,4),$car1);      # tp[num-2]=
-        &psrlq  ($car0,32);
-        &psrlq  ($car1,32);
-
-        &movd   ($temp,&DWP($frame+4,"esp",$num,4));    # += tp[num]
-        &paddq  ($car1,$car0);
-        &paddq  ($car1,$temp);
-        &movq   (&QWP($frame,"esp",$num,4),$car1);      # tp[num].tp[num-1]
-
-        &lea    ($i,&DWP(1,$i));                # i++
-        &cmp    ($i,$num);
-        &jle    (&label("outer"));
-
-        &emms   ();                             # done with mmx bank
-        &jmp    (&label("common_tail"));
-
-&set_label("non_sse2",16);
-}
-
-if (0) {
-        &mov    ("esp",$_sp);
-        &xor    ("eax","eax");  # signal "not fast enough [yet]"
-        &jmp    (&label("just_leave"));
-        # While the below code provides competitive performance for
-        # all key lengthes on modern Intel cores, it's still more
-        # than 10% slower for 4096-bit key elsewhere:-( "Competitive"
-        # means compared to the original integer-only assembler.
-        # 512-bit RSA sign is better by ~40%, but that's about all
-        # one can say about all CPUs...
-} else {
-$inp="esi";     # integer path uses these registers differently
-$word="edi";
-$carry="ebp";
-
-        &mov    ($inp,$_ap);
-        &lea    ($carry,&DWP(1,$num));
-        &mov    ($word,$_bp);
-        &xor    ($j,$j);                                # j=0
-        &mov    ("edx",$inp);
-        &and    ($carry,1);                             # see if num is even
-        &sub    ("edx",$word);                          # see if ap==bp
-        &lea    ("eax",&DWP(4,$word,$num,4));           # &bp[num]
-        &or     ($carry,"edx");
-        &mov    ($word,&DWP(0,$word));                  # bp[0]
-        &jz     (&label("bn_sqr_mont"));
-        &mov    ($_bpend,"eax");
-        &mov    ("eax",&DWP(0,$inp));
-        &xor    ("edx","edx");
-
-&set_label("mull",16);
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # ap[j]*bp[0]
-        &add    ($carry,"eax");
-        &lea    ($j,&DWP(1,$j));
-        &adc    ("edx",0);
-        &mov    ("eax",&DWP(0,$inp,$j,4));              # ap[j+1]
-        &cmp    ($j,$num);
-        &mov    (&DWP($frame-4,"esp",$j,4),$carry);     # tp[j]=
-        &jl     (&label("mull"));
-
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # ap[num-1]*bp[0]
-         &mov   ($word,$_n0);
-        &add    ("eax",$carry);
-         &mov   ($inp,$_np);
-        &adc    ("edx",0);
-         &imul  ($word,&DWP($frame,"esp"));             # n0*tp[0]
-
-        &mov    (&DWP($frame,"esp",$num,4),"eax");      # tp[num-1]=
-        &xor    ($j,$j);
-        &mov    (&DWP($frame+4,"esp",$num,4),"edx");    # tp[num]=
-        &mov    (&DWP($frame+8,"esp",$num,4),$j);       # tp[num+1]=
-
-        &mov    ("eax",&DWP(0,$inp));                   # np[0]
-        &mul    ($word);                                # np[0]*m
-        &add    ("eax",&DWP($frame,"esp"));             # +=tp[0]
-        &mov    ("eax",&DWP(4,$inp));                   # np[1]
-        &adc    ("edx",0);
-        &inc    ($j);
-
-        &jmp    (&label("2ndmadd"));
-
-&set_label("1stmadd",16);
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # ap[j]*bp[i]
-        &add    ($carry,&DWP($frame,"esp",$j,4));       # +=tp[j]
-        &lea    ($j,&DWP(1,$j));
-        &adc    ("edx",0);
-        &add    ($carry,"eax");
-        &mov    ("eax",&DWP(0,$inp,$j,4));              # ap[j+1]
-        &adc    ("edx",0);
-        &cmp    ($j,$num);
-        &mov    (&DWP($frame-4,"esp",$j,4),$carry);     # tp[j]=
-        &jl     (&label("1stmadd"));
-
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # ap[num-1]*bp[i]
-        &add    ("eax",&DWP($frame,"esp",$num,4));      # +=tp[num-1]
-         &mov   ($word,$_n0);
-        &adc    ("edx",0);
-         &mov   ($inp,$_np);
-        &add    ($carry,"eax");
-        &adc    ("edx",0);
-         &imul  ($word,&DWP($frame,"esp"));             # n0*tp[0]
-
-        &xor    ($j,$j);
-        &add    ("edx",&DWP($frame+4,"esp",$num,4));    # carry+=tp[num]
-        &mov    (&DWP($frame,"esp",$num,4),$carry);     # tp[num-1]=
-        &adc    ($j,0);
-         &mov   ("eax",&DWP(0,$inp));                   # np[0]
-        &mov    (&DWP($frame+4,"esp",$num,4),"edx");    # tp[num]=
-        &mov    (&DWP($frame+8,"esp",$num,4),$j);       # tp[num+1]=
-
-        &mul    ($word);                                # np[0]*m
-        &add    ("eax",&DWP($frame,"esp"));             # +=tp[0]
-        &mov    ("eax",&DWP(4,$inp));                   # np[1]
-        &adc    ("edx",0);
-        &mov    ($j,1);
-
-&set_label("2ndmadd",16);
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # np[j]*m
-        &add    ($carry,&DWP($frame,"esp",$j,4));       # +=tp[j]
-        &lea    ($j,&DWP(1,$j));
-        &adc    ("edx",0);
-        &add    ($carry,"eax");
-        &mov    ("eax",&DWP(0,$inp,$j,4));              # np[j+1]
-        &adc    ("edx",0);
-        &cmp    ($j,$num);
-        &mov    (&DWP($frame-8,"esp",$j,4),$carry);     # tp[j-1]=
-        &jl     (&label("2ndmadd"));
-
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # np[j]*m
-        &add    ($carry,&DWP($frame,"esp",$num,4));     # +=tp[num-1]
-        &adc    ("edx",0);
-        &add    ($carry,"eax");
-        &adc    ("edx",0);
-        &mov    (&DWP($frame-4,"esp",$num,4),$carry);   # tp[num-2]=
-
-        &xor    ("eax","eax");
-         &mov   ($j,$_bp);                              # &bp[i]
-        &add    ("edx",&DWP($frame+4,"esp",$num,4));    # carry+=tp[num]
-        &adc    ("eax",&DWP($frame+8,"esp",$num,4));    # +=tp[num+1]
-         &lea   ($j,&DWP(4,$j));
-        &mov    (&DWP($frame,"esp",$num,4),"edx");      # tp[num-1]=
-         &cmp   ($j,$_bpend);
-        &mov    (&DWP($frame+4,"esp",$num,4),"eax");    # tp[num]=
-        &je     (&label("common_tail"));
-
-        &mov    ($word,&DWP(0,$j));                     # bp[i+1]
-        &mov    ($inp,$_ap);
-        &mov    ($_bp,$j);                              # &bp[++i]
-        &xor    ($j,$j);
-        &xor    ("edx","edx");
-        &mov    ("eax",&DWP(0,$inp));
-        &jmp    (&label("1stmadd"));
-
-&set_label("bn_sqr_mont",16);
-$sbit=$num;
-        &mov    ($_num,$num);
-        &mov    ($_bp,$j);                              # i=0
-
-        &mov    ("eax",$word);                          # ap[0]
-        &mul    ($word);                                # ap[0]*ap[0]
-        &mov    (&DWP($frame,"esp"),"eax");             # tp[0]=
-        &mov    ($sbit,"edx");
-        &shr    ("edx",1);
-        &and    ($sbit,1);
-        &inc    ($j);
-&set_label("sqr",16);
-        &mov    ("eax",&DWP(0,$inp,$j,4));              # ap[j]
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # ap[j]*ap[0]
-        &add    ("eax",$carry);
-        &lea    ($j,&DWP(1,$j));
-        &adc    ("edx",0);
-        &lea    ($carry,&DWP(0,$sbit,"eax",2));
-        &shr    ("eax",31);
-        &cmp    ($j,$_num);
-        &mov    ($sbit,"eax");
-        &mov    (&DWP($frame-4,"esp",$j,4),$carry);     # tp[j]=
-        &jl     (&label("sqr"));
-
-        &mov    ("eax",&DWP(0,$inp,$j,4));              # ap[num-1]
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # ap[num-1]*ap[0]
-        &add    ("eax",$carry);
-         &mov   ($word,$_n0);
-        &adc    ("edx",0);
-         &mov   ($inp,$_np);
-        &lea    ($carry,&DWP(0,$sbit,"eax",2));
-         &imul  ($word,&DWP($frame,"esp"));             # n0*tp[0]
-        &shr    ("eax",31);
-        &mov    (&DWP($frame,"esp",$j,4),$carry);       # tp[num-1]=
-
-        &lea    ($carry,&DWP(0,"eax","edx",2));
-         &mov   ("eax",&DWP(0,$inp));                   # np[0]
-        &shr    ("edx",31);
-        &mov    (&DWP($frame+4,"esp",$j,4),$carry);     # tp[num]=
-        &mov    (&DWP($frame+8,"esp",$j,4),"edx");      # tp[num+1]=
-
-        &mul    ($word);                                # np[0]*m
-        &add    ("eax",&DWP($frame,"esp"));             # +=tp[0]
-        &mov    ($num,$j);
-        &adc    ("edx",0);
-        &mov    ("eax",&DWP(4,$inp));                   # np[1]
-        &mov    ($j,1);
-
-&set_label("3rdmadd",16);
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # np[j]*m
-        &add    ($carry,&DWP($frame,"esp",$j,4));       # +=tp[j]
-        &adc    ("edx",0);
-        &add    ($carry,"eax");
-        &mov    ("eax",&DWP(4,$inp,$j,4));              # np[j+1]
-        &adc    ("edx",0);
-        &mov    (&DWP($frame-4,"esp",$j,4),$carry);     # tp[j-1]=
-
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # np[j+1]*m
-        &add    ($carry,&DWP($frame+4,"esp",$j,4));     # +=tp[j+1]
-        &lea    ($j,&DWP(2,$j));
-        &adc    ("edx",0);
-        &add    ($carry,"eax");
-        &mov    ("eax",&DWP(0,$inp,$j,4));              # np[j+2]
-        &adc    ("edx",0);
-        &cmp    ($j,$num);
-        &mov    (&DWP($frame-8,"esp",$j,4),$carry);     # tp[j]=
-        &jl     (&label("3rdmadd"));
-
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # np[j]*m
-        &add    ($carry,&DWP($frame,"esp",$num,4));     # +=tp[num-1]
-        &adc    ("edx",0);
-        &add    ($carry,"eax");
-        &adc    ("edx",0);
-        &mov    (&DWP($frame-4,"esp",$num,4),$carry);   # tp[num-2]=
-
-        &mov    ($j,$_bp);                              # i
-        &xor    ("eax","eax");
-        &mov    ($inp,$_ap);
-        &add    ("edx",&DWP($frame+4,"esp",$num,4));    # carry+=tp[num]
-        &adc    ("eax",&DWP($frame+8,"esp",$num,4));    # +=tp[num+1]
-        &mov    (&DWP($frame,"esp",$num,4),"edx");      # tp[num-1]=
-        &cmp    ($j,$num);
-        &mov    (&DWP($frame+4,"esp",$num,4),"eax");    # tp[num]=
-        &je     (&label("common_tail"));
-
-        &mov    ($word,&DWP(4,$inp,$j,4));              # ap[i]
-        &lea    ($j,&DWP(1,$j));
-        &mov    ("eax",$word);
-        &mov    ($_bp,$j);                              # ++i
-        &mul    ($word);                                # ap[i]*ap[i]
-        &add    ("eax",&DWP($frame,"esp",$j,4));        # +=tp[i]
-        &adc    ("edx",0);
-        &mov    (&DWP($frame,"esp",$j,4),"eax");        # tp[i]=
-        &xor    ($carry,$carry);
-        &cmp    ($j,$num);
-        &lea    ($j,&DWP(1,$j));
-        &je     (&label("sqrlast"));
-
-        &mov    ($sbit,"edx");                          # zaps $num
-        &shr    ("edx",1);
-        &and    ($sbit,1);
-&set_label("sqradd",16);
-        &mov    ("eax",&DWP(0,$inp,$j,4));              # ap[j]
-        &mov    ($carry,"edx");
-        &mul    ($word);                                # ap[j]*ap[i]
-        &add    ("eax",$carry);
-        &lea    ($carry,&DWP(0,"eax","eax"));
-        &adc    ("edx",0);
-        &shr    ("eax",31);
-        &add    ($carry,&DWP($frame,"esp",$j,4));       # +=tp[j]
-        &lea    ($j,&DWP(1,$j));
-        &adc    ("eax",0);
-        &add    ($carry,$sbit);
-        &adc    ("eax",0);
-        &cmp    ($j,$_num);
-        &mov    (&DWP($frame-4,"esp",$j,4),$carry);     # tp[j]=
-        &mov    ($sbit,"eax");
-        &jle    (&label("sqradd"));
-
-        &mov    ($carry,"edx");
-        &lea    ("edx",&DWP(0,$sbit,"edx",2));
-        &shr    ($carry,31);
-&set_label("sqrlast");
-        &mov    ($word,$_n0);
-        &mov    ($inp,$_np);
-        &imul   ($word,&DWP($frame,"esp"));             # n0*tp[0]
-
-        &add    ("edx",&DWP($frame,"esp",$j,4));        # +=tp[num]
-        &mov    ("eax",&DWP(0,$inp));                   # np[0]
-        &adc    ($carry,0);
-        &mov    (&DWP($frame,"esp",$j,4),"edx");        # tp[num]=
-        &mov    (&DWP($frame+4,"esp",$j,4),$carry);     # tp[num+1]=
-
-        &mul    ($word);                                # np[0]*m
-        &add    ("eax",&DWP($frame,"esp"));             # +=tp[0]
-        &lea    ($num,&DWP(-1,$j));
-        &adc    ("edx",0);
-        &mov    ($j,1);
-        &mov    ("eax",&DWP(4,$inp));                   # np[1]
-
-        &jmp    (&label("3rdmadd"));
-}
-
-&set_label("common_tail",16);
-        &mov    ($np,$_np);                     # load modulus pointer
-        &mov    ($rp,$_rp);                     # load result pointer
-        &lea    ($tp,&DWP($frame,"esp"));       # [$ap and $bp are zapped]
-
-        &mov    ("eax",&DWP(0,$tp));            # tp[0]
-        &mov    ($j,$num);                      # j=num-1
-        &xor    ($i,$i);                        # i=0 and clear CF!
-
-&set_label("sub",16);
-        &sbb    ("eax",&DWP(0,$np,$i,4));
-        &mov    (&DWP(0,$rp,$i,4),"eax");       # rp[i]=tp[i]-np[i]
-        &dec    ($j);                           # doesn't affect CF!
-        &mov    ("eax",&DWP(4,$tp,$i,4));       # tp[i+1]
-        &lea    ($i,&DWP(1,$i));                # i++
-        &jge    (&label("sub"));
-
-        &sbb    ("eax",0);                      # handle upmost overflow bit
-        &and    ($tp,"eax");
-        &not    ("eax");
-        &mov    ($np,$rp);
-        &and    ($np,"eax");
-        &or     ($tp,$np);                      # tp=carry?tp:rp
-
-&set_label("copy",16);                          # copy or in-place refresh
-        &mov    ("eax",&DWP(0,$tp,$num,4));
-        &mov    (&DWP(0,$rp,$num,4),"eax");     # rp[i]=tp[i]
-        &mov    (&DWP($frame,"esp",$num,4),$j); # zap temporary vector
-        &dec    ($num);
-        &jge    (&label("copy"));
-
-        &mov    ("esp",$_sp);           # pull saved stack pointer
-        &mov    ("eax",1);
-&set_label("just_leave");
-&function_end("bn_mul_mont");
-
-&asciz("Montgomery Multiplication for x86, CRYPTOGAMS by <appro\@openssl.org>");
-
-&asm_finish();
diff --git a/src/lib/libcrypto/bn/asm/pa-risc.s b/src/lib/libcrypto/bn/asm/pa-risc.s
deleted file mode 100644
index 775130a191..0000000000
--- a/src/lib/libcrypto/bn/asm/pa-risc.s
+++ /dev/null
@@ -1,710 +0,0 @@
-        .SPACE $PRIVATE$
-        .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-        .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-        .SPACE $TEXT$
-        .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-        .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-        .IMPORT $global$,DATA
-        .IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-        .SPACE $TEXT$
-        .SUBSPA $CODE$
-
-        .align 4
-        .EXPORT bn_mul_add_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR
-bn_mul_add_words
-        .PROC
-        .CALLINFO FRAME=0,CALLS,SAVE_RP
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        ldi 0,%r28
-        extru %r23,31,16,%r2
-        stw %r2,-16(0,%r30)
-        extru %r23,15,16,%r23
-        ldil L'65536,%r31
-        fldws -16(0,%r30),%fr11R
-        stw %r23,-16(0,%r30)
-        ldo 12(%r25),%r29
-        ldo 12(%r26),%r23
-        fldws -16(0,%r30),%fr11L
-L$0002
-        ldw 0(0,%r25),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0005
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw 0(0,%r26),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,0(0,%r26)
-        ldw -8(0,%r29),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0010
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw -8(0,%r23),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,-8(0,%r23)
-        ldw -4(0,%r29),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0015
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw -4(0,%r23),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,-4(0,%r23)
-        ldw 0(0,%r29),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0020
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw 0(0,%r23),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,0(0,%r23)
-        ldo 16(%r29),%r29
-        ldo 16(%r25),%r25
-        ldo 16(%r23),%r23
-        bl L$0002,0
-        ldo 16(%r26),%r26
-L$0003
-        ldw -20(0,%r30),%r2
-        bv,n 0(%r2)
-        .EXIT
-        .PROCEND
-        .align 4
-        .EXPORT bn_mul_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR
-bn_mul_words
-        .PROC
-        .CALLINFO FRAME=0,CALLS,SAVE_RP
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        ldi 0,%r28
-        extru %r23,31,16,%r2
-        stw %r2,-16(0,%r30)
-        extru %r23,15,16,%r23
-        ldil L'65536,%r31
-        fldws -16(0,%r30),%fr11R
-        stw %r23,-16(0,%r30)
-        ldo 12(%r26),%r29
-        ldo 12(%r25),%r23
-        fldws -16(0,%r30),%fr11L
-L$0026
-        ldw 0(0,%r25),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0029
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,0(0,%r26)
-        ldw -8(0,%r23),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0033
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,-8(0,%r29)
-        ldw -4(0,%r23),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0037
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,-4(0,%r29)
-        ldw 0(0,%r23),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0041
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,0(0,%r29)
-        ldo 16(%r23),%r23
-        ldo 16(%r25),%r25
-        ldo 16(%r29),%r29
-        bl L$0026,0
-        ldo 16(%r26),%r26
-L$0027
-        ldw -20(0,%r30),%r2
-        bv,n 0(%r2)
-        .EXIT
-        .PROCEND
-        .align 4
-        .EXPORT bn_sqr_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR
-bn_sqr_words
-        .PROC
-        .CALLINFO FRAME=0,NO_CALLS
-        .ENTRY
-        ldo 28(%r26),%r23
-        ldo 12(%r25),%r28
-L$0046
-        ldw 0(0,%r25),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,0(0,%r26)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,-24(0,%r23)
-        ldw -8(0,%r28),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,-20(0,%r23)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,-16(0,%r23)
-        ldw -4(0,%r28),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,-12(0,%r23)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,-8(0,%r23)
-        ldw 0(0,%r28),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,-4(0,%r23)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,0(0,%r23)
-        ldo 16(%r28),%r28
-        ldo 16(%r25),%r25
-        ldo 32(%r23),%r23
-        bl L$0046,0
-        ldo 32(%r26),%r26
-L$0057
-        bv,n 0(%r2)
-        .EXIT
-        .PROCEND
-        .IMPORT BN_num_bits_word,CODE
-        .IMPORT fprintf,CODE
-        .IMPORT __iob,DATA
-        .SPACE $TEXT$
-        .SUBSPA $LIT$
-
-        .align 4
-L$C0000
-        .STRING "Division would overflow\x0a\x00"
-        .IMPORT abort,CODE
-        .SPACE $TEXT$
-        .SUBSPA $CODE$
-
-        .align 4
-        .EXPORT bn_div64,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,RTNVAL=GR
-bn_div64
-        .PROC
-        .CALLINFO FRAME=128,CALLS,SAVE_RP,ENTRY_GR=8
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        stwm %r8,128(0,%r30)
-        stw %r7,-124(0,%r30)
-        stw %r4,-112(0,%r30)
-        stw %r3,-108(0,%r30)
-        copy %r26,%r3
-        copy %r25,%r4
-        stw %r6,-120(0,%r30)
-        ldi 0,%r7
-        stw %r5,-116(0,%r30)
-        movb,<> %r24,%r5,L$0059
-        ldi 2,%r6
-        bl L$0076,0
-        ldi -1,%r28
-L$0059
-        .CALL ARGW0=GR
-        bl BN_num_bits_word,%r2
-        copy %r5,%r26
-        ldi 32,%r19
-        comb,= %r19,%r28,L$0060
-        subi 31,%r28,%r19
-        mtsar %r19
-        zvdepi 1,32,%r19
-        comb,>>= %r19,%r3,L$0060
-        addil LR'__iob-$global$+32,%r27
-        ldo RR'__iob-$global$+32(%r1),%r26
-        ldil LR'L$C0000,%r25
-        .CALL ARGW0=GR,ARGW1=GR
-        bl fprintf,%r2
-        ldo RR'L$C0000(%r25),%r25
-        .CALL 
-        bl abort,%r2
-        nop
-L$0060
-        comb,>> %r5,%r3,L$0061
-        subi 32,%r28,%r28
-        sub %r3,%r5,%r3
-L$0061
-        comib,= 0,%r28,L$0062
-        subi 31,%r28,%r19
-        mtsar %r19
-        zvdep %r5,32,%r5
-        zvdep %r3,32,%r21
-        subi 32,%r28,%r20
-        mtsar %r20
-        vshd 0,%r4,%r20
-        or %r21,%r20,%r3
-        mtsar %r19
-        zvdep %r4,32,%r4
-L$0062
-        extru %r5,15,16,%r23
-        extru %r5,31,16,%r28
-L$0063
-        extru %r3,15,16,%r19
-        comb,<> %r23,%r19,L$0066
-        copy %r3,%r26
-        bl L$0067,0
-        zdepi -1,31,16,%r29
-L$0066
-        .IMPORT $$divU,MILLICODE
-        bl $$divU,%r31
-        copy %r23,%r25
-L$0067
-        stw %r29,-16(0,%r30)
-        fldws -16(0,%r30),%fr10L
-        stw %r28,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r23,-16(0,%r30)
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr10L,%fr10R,%fr9
-        ldw -16(0,%r30),%r8
-        fstws %fr9R,-16(0,%r30)
-        copy %r8,%r22
-        ldw -16(0,%r30),%r8
-        extru %r4,15,16,%r24
-        copy %r8,%r21
-L$0068
-        sub %r3,%r21,%r20
-        copy %r20,%r19
-        depi 0,31,16,%r19
-        comib,<> 0,%r19,L$0069
-        zdep %r20,15,16,%r19
-        addl %r19,%r24,%r19
-        comb,>>= %r19,%r22,L$0069
-        sub %r22,%r28,%r22
-        sub %r21,%r23,%r21
-        bl L$0068,0
-        ldo -1(%r29),%r29
-L$0069
-        stw %r29,-16(0,%r30)
-        fldws -16(0,%r30),%fr10L
-        stw %r28,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r8
-        stw %r23,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        copy %r8,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,15,16,%r20
-        ldw -16(0,%r30),%r8
-        zdep %r19,15,16,%r19
-        addl %r8,%r20,%r20
-        comclr,<<= %r19,%r4,0
-        addi 1,%r20,%r20
-        comb,<<= %r20,%r3,L$0074
-        sub %r4,%r19,%r4
-        addl %r3,%r5,%r3
-        ldo -1(%r29),%r29
-L$0074
-        addib,= -1,%r6,L$0064
-        sub %r3,%r20,%r3
-        zdep %r29,15,16,%r7
-        shd %r3,%r4,16,%r3
-        bl L$0063,0
-        zdep %r4,15,16,%r4
-L$0064
-        or %r7,%r29,%r28
-L$0076
-        ldw -148(0,%r30),%r2
-        ldw -124(0,%r30),%r7
-        ldw -120(0,%r30),%r6
-        ldw -116(0,%r30),%r5
-        ldw -112(0,%r30),%r4
-        ldw -108(0,%r30),%r3
-        bv 0(%r2)
-        ldwm -128(0,%r30),%r8
-        .EXIT
-        .PROCEND
diff --git a/src/lib/libcrypto/bn/asm/r3000.s b/src/lib/libcrypto/bn/asm/r3000.s
deleted file mode 100644
index e95269afa3..0000000000
--- a/src/lib/libcrypto/bn/asm/r3000.s
+++ /dev/null
@@ -1,646 +0,0 @@
-        .file   1 "../bn_mulw.c"
-        .set    nobopt
-        .option pic2
-
- # GNU C 2.6.3 [AL 1.1, MM 40] SGI running IRIX 5.0 compiled by GNU C
-
- # Cc1 defaults:
- # -mabicalls
-
- # Cc1 arguments (-G value = 0, Cpu = 3000, ISA = 1):
- # -quiet -dumpbase -O2 -o
-
-gcc2_compiled.:
-__gnu_compiled_c:
-        .rdata
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x34,0x39,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x33,0x34,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x35,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x38,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x32,0x33,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x37,0x38,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x33,0x2e,0x37,0x30,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x32,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x34,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x38,0x20,0x24
-        .byte   0x0
-        .text
-        .align  2
-        .globl  bn_mul_add_words
-        .ent    bn_mul_add_words
-bn_mul_add_words:
-        .frame  $sp,0,$31               # vars= 0, regs= 0/0, args= 0, extra= 0
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        move    $12,$4
-        move    $14,$5
-        move    $9,$6
-        move    $13,$7
-        move    $8,$0
-        addu    $10,$12,12
-        addu    $11,$14,12
-$L2:
-        lw      $6,0($14)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,0($12)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,0($12)
-        .set    macro
-        .set    reorder
-
-        lw      $6,-8($11)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,-8($10)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,-8($10)
-        .set    macro
-        .set    reorder
-
-        lw      $6,-4($11)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,-4($10)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,-4($10)
-        .set    macro
-        .set    reorder
-
-        lw      $6,0($11)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,0($10)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,0($10)
-        .set    macro
-        .set    reorder
-
-        addu    $11,$11,16
-        addu    $14,$14,16
-        addu    $10,$10,16
-        .set    noreorder
-        .set    nomacro
-        j       $L2
-        addu    $12,$12,16
-        .set    macro
-        .set    reorder
-
-$L3:
-        .set    noreorder
-        .set    nomacro
-        j       $31
-        move    $2,$8
-        .set    macro
-        .set    reorder
-
-        .end    bn_mul_add_words
-        .align  2
-        .globl  bn_mul_words
-        .ent    bn_mul_words
-bn_mul_words:
-        .frame  $sp,0,$31               # vars= 0, regs= 0/0, args= 0, extra= 0
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        move    $11,$4
-        move    $12,$5
-        move    $8,$6
-        move    $6,$0
-        addu    $10,$11,12
-        addu    $9,$12,12
-$L10:
-        lw      $4,0($12)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,0($11)
-        .set    macro
-        .set    reorder
-
-        lw      $4,-8($9)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,-8($10)
-        .set    macro
-        .set    reorder
-
-        lw      $4,-4($9)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,-4($10)
-        .set    macro
-        .set    reorder
-
-        lw      $4,0($9)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,0($10)
-        .set    macro
-        .set    reorder
-
-        addu    $9,$9,16
-        addu    $12,$12,16
-        addu    $10,$10,16
-        .set    noreorder
-        .set    nomacro
-        j       $L10
-        addu    $11,$11,16
-        .set    macro
-        .set    reorder
-
-$L11:
-        .set    noreorder
-        .set    nomacro
-        j       $31
-        move    $2,$6
-        .set    macro
-        .set    reorder
-
-        .end    bn_mul_words
-        .align  2
-        .globl  bn_sqr_words
-        .ent    bn_sqr_words
-bn_sqr_words:
-        .frame  $sp,0,$31               # vars= 0, regs= 0/0, args= 0, extra= 0
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        move    $9,$4
-        addu    $7,$9,28
-        addu    $8,$5,12
-$L18:
-        lw      $2,0($5)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,0($9)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,-24($7)
-        .set    macro
-        .set    reorder
-
-        lw      $2,-8($8)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,-20($7)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,-16($7)
-        .set    macro
-        .set    reorder
-
-        lw      $2,-4($8)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,-12($7)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,-8($7)
-        .set    macro
-        .set    reorder
-
-        lw      $2,0($8)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,-4($7)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,0($7)
-        .set    macro
-        .set    reorder
-
-        addu    $8,$8,16
-        addu    $5,$5,16
-        addu    $7,$7,32
-        .set    noreorder
-        .set    nomacro
-        j       $L18
-        addu    $9,$9,32
-        .set    macro
-        .set    reorder
-
-$L19:
-        j       $31
-        .end    bn_sqr_words
-        .rdata
-        .align  2
-$LC0:
-
-        .byte   0x44,0x69,0x76,0x69,0x73,0x69,0x6f,0x6e
-        .byte   0x20,0x77,0x6f,0x75,0x6c,0x64,0x20,0x6f
-        .byte   0x76,0x65,0x72,0x66,0x6c,0x6f,0x77,0xa
-        .byte   0x0
-        .text
-        .align  2
-        .globl  bn_div64
-        .ent    bn_div64
-bn_div64:
-        .frame  $sp,56,$31              # vars= 0, regs= 7/0, args= 16, extra= 8
-        .mask   0x901f0000,-8
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        subu    $sp,$sp,56
-        .cprestore 16
-        sw      $16,24($sp)
-        move    $16,$4
-        sw      $17,28($sp)
-        move    $17,$5
-        sw      $18,32($sp)
-        move    $18,$6
-        sw      $20,40($sp)
-        move    $20,$0
-        sw      $19,36($sp)
-        li      $19,0x00000002          # 2
-        sw      $31,48($sp)
-        .set    noreorder
-        .set    nomacro
-        bne     $18,$0,$L26
-        sw      $28,44($sp)
-        .set    macro
-        .set    reorder
-
-        .set    noreorder
-        .set    nomacro
-        j       $L43
-        li      $2,-1                   # 0xffffffff
-        .set    macro
-        .set    reorder
-
-$L26:
-        move    $4,$18
-        jal     BN_num_bits_word
-        move    $4,$2
-        li      $2,0x00000020           # 32
-        .set    noreorder
-        .set    nomacro
-        beq     $4,$2,$L27
-        li      $2,0x00000001           # 1
-        .set    macro
-        .set    reorder
-
-        sll     $2,$2,$4
-        sltu    $2,$2,$16
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L44
-        li      $5,0x00000020           # 32
-        .set    macro
-        .set    reorder
-
-        la      $4,__iob+32
-        la      $5,$LC0
-        jal     fprintf
-        jal     abort
-$L27:
-        li      $5,0x00000020           # 32
-$L44:
-        sltu    $2,$16,$18
-        .set    noreorder
-        .set    nomacro
-        bne     $2,$0,$L28
-        subu    $4,$5,$4
-        .set    macro
-        .set    reorder
-
-        subu    $16,$16,$18
-$L28:
-        .set    noreorder
-        .set    nomacro
-        beq     $4,$0,$L29
-        li      $10,-65536                      # 0xffff0000
-        .set    macro
-        .set    reorder
-
-        sll     $18,$18,$4
-        sll     $3,$16,$4
-        subu    $2,$5,$4
-        srl     $2,$17,$2
-        or      $16,$3,$2
-        sll     $17,$17,$4
-$L29:
-        srl     $7,$18,16
-        andi    $9,$18,0xffff
-$L30:
-        srl     $2,$16,16
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$7,$L34
-        li      $6,0x0000ffff           # 65535
-        .set    macro
-        .set    reorder
-
-        divu    $6,$16,$7
-$L34:
-        mult    $6,$9
-        mflo    $5
-        #nop
-        #nop
-        mult    $6,$7
-        and     $2,$17,$10
-        srl     $8,$2,16
-        mflo    $4
-$L35:
-        subu    $3,$16,$4
-        and     $2,$3,$10
-        .set    noreorder
-        .set    nomacro
-        bne     $2,$0,$L36
-        sll     $2,$3,16
-        .set    macro
-        .set    reorder
-
-        addu    $2,$2,$8
-        sltu    $2,$2,$5
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L36
-        subu    $5,$5,$9
-        .set    macro
-        .set    reorder
-
-        subu    $4,$4,$7
-        .set    noreorder
-        .set    nomacro
-        j       $L35
-        addu    $6,$6,-1
-        .set    macro
-        .set    reorder
-
-$L36:
-        mult    $6,$7
-        mflo    $5
-        #nop
-        #nop
-        mult    $6,$9
-        mflo    $4
-        #nop
-        #nop
-        srl     $3,$4,16
-        sll     $2,$4,16
-        and     $4,$2,$10
-        sltu    $2,$17,$4
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L40
-        addu    $5,$5,$3
-        .set    macro
-        .set    reorder
-
-        addu    $5,$5,1
-$L40:
-        sltu    $2,$16,$5
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L41
-        subu    $17,$17,$4
-        .set    macro
-        .set    reorder
-
-        addu    $16,$16,$18
-        addu    $6,$6,-1
-$L41:
-        addu    $19,$19,-1
-        .set    noreorder
-        .set    nomacro
-        beq     $19,$0,$L31
-        subu    $16,$16,$5
-        .set    macro
-        .set    reorder
-
-        sll     $20,$6,16
-        sll     $3,$16,16
-        srl     $2,$17,16
-        or      $16,$3,$2
-        .set    noreorder
-        .set    nomacro
-        j       $L30
-        sll     $17,$17,16
-        .set    macro
-        .set    reorder
-
-$L31:
-        or      $2,$20,$6
-$L43:
-        lw      $31,48($sp)
-        lw      $20,40($sp)
-        lw      $19,36($sp)
-        lw      $18,32($sp)
-        lw      $17,28($sp)
-        lw      $16,24($sp)
-        addu    $sp,$sp,56
-        j       $31
-        .end    bn_div64
-
-        .globl abort .text
-        .globl fprintf .text
-        .globl BN_num_bits_word .text
diff --git a/src/lib/libcrypto/bn/bn_opt.c b/src/lib/libcrypto/bn/bn_opt.c
deleted file mode 100644
index 21cbb38f62..0000000000
--- a/src/lib/libcrypto/bn/bn_opt.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* crypto/bn/bn_opt.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef BN_DEBUG
-# undef NDEBUG /* avoid conflicting definitions */
-# define NDEBUG
-#endif
-
-#include <assert.h>
-#include <limits.h>
-#include <stdio.h>
-#include "cryptlib.h"
-#include "bn_lcl.h"
-
-char *BN_options(void)
-        {
-        static int init=0;
-        static char data[16];
-
-        if (!init)
-                {
-                init++;
-#ifdef BN_LLONG
-                BIO_snprintf(data,sizeof data,"bn(%d,%d)",
-                             (int)sizeof(BN_ULLONG)*8,(int)sizeof(BN_ULONG)*8);
-#else
-                BIO_snprintf(data,sizeof data,"bn(%d,%d)",
-                             (int)sizeof(BN_ULONG)*8,(int)sizeof(BN_ULONG)*8);
-#endif
-                }
-        return(data);
-        }
diff --git a/src/lib/libcrypto/camellia/Makefile b/src/lib/libcrypto/camellia/Makefile
new file mode 100644
index 0000000000..ff5fe4a01d
--- /dev/null
+++ b/src/lib/libcrypto/camellia/Makefile
@@ -0,0 +1,103 @@
+#
+# crypto/camellia/Makefile
+#
+
+DIR= camellia
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG)
+AFLAGS= $(ASFLAGS)
+
+GENERAL=Makefile
+#TEST=camelliatest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \
+           cmll_cfb.c cmll_ctr.c 
+
+LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC)
+
+SRC= $(LIBSRC)
+
+EXHEADER= camellia.h
+HEADER= cmll_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+cmll-x86.s:     asm/cmll-x86.pl ../perlasm/x86asm.pl
+        $(PERL) asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+cmll-x86_64.s:  asm/cmll-x86_64.pl
+        $(PERL) asm/cmll-x86_64.pl $(PERLASM_SCHEME) > $@
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+camellia.o: ../../include/openssl/opensslconf.h camellia.c camellia.h
+camellia.o: cmll_locl.h
+cmll_cbc.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_cbc.o: ../../include/openssl/opensslconf.h cmll_cbc.c
+cmll_cfb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_cfb.o: ../../include/openssl/opensslconf.h cmll_cfb.c
+cmll_ctr.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_ctr.o: ../../include/openssl/opensslconf.h cmll_ctr.c
+cmll_ecb.o: ../../include/openssl/camellia.h
+cmll_ecb.o: ../../include/openssl/opensslconf.h cmll_ecb.c cmll_locl.h
+cmll_misc.o: ../../include/openssl/camellia.h
+cmll_misc.o: ../../include/openssl/opensslconf.h
+cmll_misc.o: ../../include/openssl/opensslv.h cmll_locl.h cmll_misc.c
+cmll_ofb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h
+cmll_ofb.o: ../../include/openssl/opensslconf.h cmll_ofb.c
diff --git a/src/lib/libcrypto/cms/Makefile b/src/lib/libcrypto/cms/Makefile
new file mode 100644
index 0000000000..5837049725
--- /dev/null
+++ b/src/lib/libcrypto/cms/Makefile
@@ -0,0 +1,264 @@
+#
+# OpenSSL/crypto/cms/Makefile
+#
+
+DIR=    cms
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
+        cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
+LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \
+        cms_sd.o cms_dd.o cms_cd.o cms_env.o cms_enc.o cms_ess.o
+
+SRC= $(LIBSRC)
+
+EXHEADER=  cms.h
+HEADER= cms_lcl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+test:
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+cms_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_asn1.o: ../../include/openssl/opensslconf.h
+cms_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_asn1.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_asn1.o: cms.h cms_asn1.c cms_lcl.h
+cms_att.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+cms_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_att.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_att.o: cms.h cms_att.c cms_lcl.h
+cms_cd.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_cd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_cd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_cd.o: ../../include/openssl/comp.h ../../include/openssl/conf.h
+cms_cd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_cd.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_cd.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_cd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_cd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_cd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_cd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+cms_cd.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+cms_cd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_cd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_cd.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+cms_cd.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_cd.c cms_lcl.h
+cms_dd.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_dd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_dd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_dd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_dd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_dd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_dd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_dd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_dd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+cms_dd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_dd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_dd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_dd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_dd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_dd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_dd.o: ../cryptlib.h cms_dd.c cms_lcl.h
+cms_enc.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_enc.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+cms_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_enc.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+cms_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+cms_enc.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_enc.c cms_lcl.h
+cms_env.o: ../../e_os.h ../../include/openssl/aes.h
+cms_env.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_env.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_env.o: ../../include/openssl/cms.h ../../include/openssl/conf.h
+cms_env.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_env.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_env.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_env.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_env.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_env.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_env.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+cms_env.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+cms_env.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+cms_env.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_env.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_env.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_env.o: ../asn1/asn1_locl.h ../cryptlib.h cms_env.c cms_lcl.h
+cms_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+cms_err.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+cms_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+cms_err.o: cms_err.c
+cms_ess.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_ess.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_ess.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_ess.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_ess.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_ess.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_ess.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_ess.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_ess.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+cms_ess.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_ess.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_ess.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+cms_ess.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_ess.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_ess.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+cms_ess.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_ess.c cms_lcl.h
+cms_io.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_io.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_io.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_io.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_io.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_io.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_io.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_io.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_io.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+cms_io.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+cms_io.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_io.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_io.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h
+cms_io.o: cms_io.c cms_lcl.h
+cms_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+cms_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+cms_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h
+cms_lib.o: cms_lcl.h cms_lib.c
+cms_sd.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_sd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_sd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_sd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_sd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_sd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_sd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_sd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_sd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+cms_sd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_sd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_sd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_sd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_sd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_sd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_sd.o: ../asn1/asn1_locl.h ../cryptlib.h cms_lcl.h cms_sd.c
+cms_smime.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_smime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_smime.o: ../../include/openssl/objects.h
+cms_smime.o: ../../include/openssl/opensslconf.h
+cms_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_smime.o: ../cryptlib.h cms_lcl.h cms_smime.c
diff --git a/src/lib/libcrypto/des/asm/des686.pl b/src/lib/libcrypto/des/asm/des686.pl
deleted file mode 100644
index d3ad5d5edd..0000000000
--- a/src/lib/libcrypto/des/asm/des686.pl
+++ /dev/null
@@ -1,230 +0,0 @@
-#!/usr/local/bin/perl
-
-$prog="des686.pl";
-
-# base code is in microsft
-# op dest, source
-# format.
-#
-
-# WILL NOT WORK ANYMORE WITH desboth.pl
-require "desboth.pl";
-
-if (    ($ARGV[0] eq "elf"))
-        { require "x86unix.pl"; }
-elsif ( ($ARGV[0] eq "a.out"))
-        { $aout=1; require "x86unix.pl"; }
-elsif ( ($ARGV[0] eq "sol"))
-        { $sol=1; require "x86unix.pl"; }
-elsif ( ($ARGV[0] eq "cpp"))
-        { $cpp=1; require "x86unix.pl"; }
-elsif ( ($ARGV[0] eq "win32"))
-        { require "x86ms.pl"; }
-else
-        {
-        print STDERR <<"EOF";
-Pick one target type from
-        elf     - linux, FreeBSD etc
-        a.out   - old linux
-        sol     - x86 solaris
-        cpp     - format so x86unix.cpp can be used
-        win32   - Windows 95/Windows NT
-EOF
-        exit(1);
-        }
-
-&comment("Don't even think of reading this code");
-&comment("It was automatically generated by $prog");
-&comment("Which is a perl program used to generate the x86 assember for");
-&comment("any of elf, a.out, Win32, or Solaris");
-&comment("It can be found in SSLeay 0.6.5+ or in libdes 3.26+");
-&comment("eric <eay\@cryptsoft.com>");
-&comment("");
-
-&file("dx86xxxx");
-
-$L="edi";
-$R="esi";
-
-&DES_encrypt("DES_encrypt1",1);
-&DES_encrypt("DES_encrypt2",0);
-
-&DES_encrypt3("DES_encrypt3",1);
-&DES_encrypt3("DES_decrypt3",0);
-
-&file_end();
-
-sub DES_encrypt
-        {
-        local($name,$do_ip)=@_;
-
-        &function_begin($name,"EXTRN   _DES_SPtrans:DWORD");
-
-        &comment("");
-        &comment("Load the 2 words");
-        &mov("eax",&wparam(0));
-        &mov($L,&DWP(0,"eax","",0));
-        &mov($R,&DWP(4,"eax","",0));
-
-        $ksp=&wparam(1);
-
-        if ($do_ip)
-                {
-                &comment("");
-                &comment("IP");
-                &IP_new($L,$R,"eax");
-                }
-
-        &comment("");
-        &comment("fixup rotate");
-        &rotl($R,3);
-        &rotl($L,3);
-        &exch($L,$R);
-
-        &comment("");
-        &comment("load counter, key_schedule and enc flag");
-        &mov("eax",&wparam(2)); # get encrypt flag
-        &mov("ebp",&wparam(1)); # get ks
-        &cmp("eax","0");
-        &je(&label("start_decrypt"));
-
-        # encrypting part
-
-        for ($i=0; $i<16; $i+=2)
-                {
-                &comment("");
-                &comment("Round $i");
-                &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
-
-                &comment("");
-                &comment("Round ".sprintf("%d",$i+1));
-                &D_ENCRYPT($R,$L,($i+1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
-                }
-        &jmp(&label("end"));
-
-        &set_label("start_decrypt");
-
-        for ($i=15; $i>0; $i-=2)
-                {
-                &comment("");
-                &comment("Round $i");
-                &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
-                &comment("");
-                &comment("Round ".sprintf("%d",$i-1));
-                &D_ENCRYPT($R,$L,($i-1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
-                }
-
-        &set_label("end");
-
-        &comment("");
-        &comment("Fixup");
-        &rotr($L,3);            # r
-        &rotr($R,3);            # l
-
-        if ($do_ip)
-                {
-                &comment("");
-                &comment("FP");
-                &FP_new($R,$L,"eax");
-                }
-
-        &mov("eax",&wparam(0));
-        &mov(&DWP(0,"eax","",0),$L);
-        &mov(&DWP(4,"eax","",0),$R);
-
-        &function_end($name);
-        }
-
-
-# The logic is to load R into 2 registers and operate on both at the same time.
-# We also load the 2 R's into 2 more registers so we can do the 'move word down a byte'
-# while also masking the other copy and doing a lookup.  We then also accumulate the
-# L value in 2 registers then combine them at the end.
-sub D_ENCRYPT
-        {
-        local($L,$R,$S,$ks,$desSP,$u,$t,$tmp1,$tmp2,$tmp3)=@_;
-
-        &mov(   $u,             &DWP(&n2a($S*4),$ks,"",0));
-        &mov(   $t,             &DWP(&n2a(($S+1)*4),$ks,"",0));
-        &xor(   $u,             $R              );
-        &xor(   $t,             $R              );
-        &rotr(  $t,             4               );
-
-        # the numbers at the end of the line are origional instruction order
-        &mov(   $tmp2,          $u              );                      # 1 2
-        &mov(   $tmp1,          $t              );                      # 1 1
-        &and(   $tmp2,          "0xfc"          );                      # 1 4
-        &and(   $tmp1,          "0xfc"          );                      # 1 3
-        &shr(   $t,             8               );                      # 1 5
-        &xor(   $L,             &DWP("0x100+$desSP",$tmp1,"",0));       # 1 7
-        &shr(   $u,             8               );                      # 1 6
-        &mov(   $tmp1,          &DWP("      $desSP",$tmp2,"",0));       # 1 8
-
-        &mov(   $tmp2,          $u              );                      # 2 2
-        &xor(   $L,             $tmp1           );                      # 1 9
-        &and(   $tmp2,          "0xfc"          );                      # 2 4
-        &mov(   $tmp1,          $t              );                      # 2 1
-        &and(   $tmp1,          "0xfc"          );                      # 2 3
-        &shr(   $t,             8               );                      # 2 5
-        &xor(   $L,             &DWP("0x300+$desSP",$tmp1,"",0));       # 2 7
-        &shr(   $u,             8               );                      # 2 6
-        &mov(   $tmp1,          &DWP("0x200+$desSP",$tmp2,"",0));       # 2 8
-        &mov(   $tmp2,          $u              );                      # 3 2
-
-        &xor(   $L,             $tmp1           );                      # 2 9
-        &and(   $tmp2,          "0xfc"          );                      # 3 4
-
-        &mov(   $tmp1,          $t              );                      # 3 1 
-        &shr(   $u,             8               );                      # 3 6
-        &and(   $tmp1,          "0xfc"          );                      # 3 3
-        &shr(   $t,             8               );                      # 3 5
-        &xor(   $L,             &DWP("0x500+$desSP",$tmp1,"",0));       # 3 7
-        &mov(   $tmp1,          &DWP("0x400+$desSP",$tmp2,"",0));       # 3 8
-
-        &and(   $t,             "0xfc"          );                      # 4 1
-        &xor(   $L,             $tmp1           );                      # 3 9
-
-        &and(   $u,             "0xfc"          );                      # 4 2
-        &xor(   $L,             &DWP("0x700+$desSP",$t,"",0));          # 4 3
-        &xor(   $L,             &DWP("0x600+$desSP",$u,"",0));          # 4 4
-        }
-
-sub PERM_OP
-        {
-        local($a,$b,$tt,$shift,$mask)=@_;
-
-        &mov(   $tt,            $a              );
-        &shr(   $tt,            $shift          );
-        &xor(   $tt,            $b              );
-        &and(   $tt,            $mask           );
-        &xor(   $b,             $tt             );
-        &shl(   $tt,            $shift          );
-        &xor(   $a,             $tt             );
-        }
-
-sub IP_new
-        {
-        local($l,$r,$tt)=@_;
-
-        &PERM_OP($r,$l,$tt, 4,"0x0f0f0f0f");
-        &PERM_OP($l,$r,$tt,16,"0x0000ffff");
-        &PERM_OP($r,$l,$tt, 2,"0x33333333");
-        &PERM_OP($l,$r,$tt, 8,"0x00ff00ff");
-        &PERM_OP($r,$l,$tt, 1,"0x55555555");
-        }
-
-sub FP_new
-        {
-        local($l,$r,$tt)=@_;
-
-        &PERM_OP($l,$r,$tt, 1,"0x55555555");
-        &PERM_OP($r,$l,$tt, 8,"0x00ff00ff");
-        &PERM_OP($l,$r,$tt, 2,"0x33333333");
-        &PERM_OP($r,$l,$tt,16,"0x0000ffff");
-        &PERM_OP($l,$r,$tt, 4,"0x0f0f0f0f");
-        }
-
-sub n2a
-        {
-        sprintf("%d",$_[0]);
-        }
diff --git a/src/lib/libcrypto/des/des_lib.c b/src/lib/libcrypto/des/des_lib.c
deleted file mode 100644
index d4b3047932..0000000000
--- a/src/lib/libcrypto/des/des_lib.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* crypto/des/ecb_enc.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "des_locl.h"
-#include "des_ver.h"
-#include <openssl/opensslv.h>
-#include <openssl/bio.h>
-
-OPENSSL_GLOBAL const char libdes_version[]="libdes" OPENSSL_VERSION_PTEXT;
-OPENSSL_GLOBAL const char DES_version[]="DES" OPENSSL_VERSION_PTEXT;
-
-const char *DES_options(void)
-        {
-        static int init=1;
-        static char buf[32];
-
-        if (init)
-                {
-                const char *ptr,*unroll,*risc,*size;
-
-#ifdef DES_PTR
-                ptr="ptr";
-#else
-                ptr="idx";
-#endif
-#if defined(DES_RISC1) || defined(DES_RISC2)
-#ifdef DES_RISC1
-                risc="risc1";
-#endif
-#ifdef DES_RISC2
-                risc="risc2";
-#endif
-#else
-                risc="cisc";
-#endif
-#ifdef DES_UNROLL
-                unroll="16";
-#else
-                unroll="4";
-#endif
-                if (sizeof(DES_LONG) != sizeof(long))
-                        size="int";
-                else
-                        size="long";
-                BIO_snprintf(buf,sizeof buf,"des(%s,%s,%s,%s)",ptr,risc,unroll,
-                             size);
-                init=0;
-                }
-        return(buf);
-        }
-
diff --git a/src/lib/libcrypto/dsa/dsa_utl.c b/src/lib/libcrypto/dsa/dsa_utl.c
deleted file mode 100644
index 24c021d120..0000000000
--- a/src/lib/libcrypto/dsa/dsa_utl.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* crypto/dsa/dsa_lib.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/asn1.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-
-DSA_SIG *DSA_SIG_new(void)
-        {
-        DSA_SIG *sig;
-        sig = OPENSSL_malloc(sizeof(DSA_SIG));
-        if (!sig)
-                return NULL;
-        sig->r = NULL;
-        sig->s = NULL;
-        return sig;
-        }
-
-void DSA_SIG_free(DSA_SIG *sig)
-        {
-        if (sig)
-                {
-                if (sig->r)
-                        BN_free(sig->r);
-                if (sig->s)
-                        BN_free(sig->s);
-                OPENSSL_free(sig);
-                }
-        }
-
diff --git a/src/lib/libcrypto/dso/dso_beos.c b/src/lib/libcrypto/dso/dso_beos.c
new file mode 100644
index 0000000000..553966e699
--- /dev/null
+++ b/src/lib/libcrypto/dso/dso_beos.c
@@ -0,0 +1,270 @@
+/* dso_beos.c */
+/* Written by Marcin Konicki (ahwayakchih@neoni.net) for the OpenSSL
+ * project 2000.
+ */
+/* ====================================================================
+ * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "cryptlib.h"
+#include <openssl/dso.h>
+
+#if !defined(OPENSSL_SYS_BEOS)
+DSO_METHOD *DSO_METHOD_beos(void)
+        {
+        return NULL;
+        }
+#else
+
+#include <kernel/image.h>
+
+static int beos_load(DSO *dso);
+static int beos_unload(DSO *dso);
+static void *beos_bind_var(DSO *dso, const char *symname);
+static DSO_FUNC_TYPE beos_bind_func(DSO *dso, const char *symname);
+#if 0
+static int beos_unbind_var(DSO *dso, char *symname, void *symptr);
+static int beos_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
+static int beos_init(DSO *dso);
+static int beos_finish(DSO *dso);
+static long beos_ctrl(DSO *dso, int cmd, long larg, void *parg);
+#endif
+static char *beos_name_converter(DSO *dso, const char *filename);
+
+static DSO_METHOD dso_meth_beos = {
+        "OpenSSL 'beos' shared library method",
+        beos_load,
+        beos_unload,
+        beos_bind_var,
+        beos_bind_func,
+/* For now, "unbind" doesn't exist */
+#if 0
+        NULL, /* unbind_var */
+        NULL, /* unbind_func */
+#endif
+        NULL, /* ctrl */
+        beos_name_converter,
+        NULL, /* init */
+        NULL  /* finish */
+        };
+
+DSO_METHOD *DSO_METHOD_beos(void)
+        {
+        return(&dso_meth_beos);
+        }
+
+/* For this DSO_METHOD, our meth_data STACK will contain;
+ * (i) a pointer to the handle (image_id) returned from
+ *     load_add_on().
+ */
+
+static int beos_load(DSO *dso)
+        {
+        image_id id;
+        /* See applicable comments from dso_dl.c */
+        char *filename = DSO_convert_filename(dso, NULL);
+
+        if(filename == NULL)
+                {
+                DSOerr(DSO_F_BEOS_LOAD,DSO_R_NO_FILENAME);
+                goto err;
+                }
+        id = load_add_on(filename);
+        if(id < 1)
+                {
+                DSOerr(DSO_F_BEOS_LOAD,DSO_R_LOAD_FAILED);
+                ERR_add_error_data(3, "filename(", filename, ")");
+                goto err;
+                }
+        if(!sk_push(dso->meth_data, (char *)id))
+                {
+                DSOerr(DSO_F_BEOS_LOAD,DSO_R_STACK_ERROR);
+                goto err;
+                }
+        /* Success */
+        dso->loaded_filename = filename;
+        return(1);
+err:
+        /* Cleanup !*/
+        if(filename != NULL)
+                OPENSSL_free(filename);
+        if(id > 0)
+                unload_add_on(id);
+        return(0);
+        }
+
+static int beos_unload(DSO *dso)
+        {
+        image_id id;
+        if(dso == NULL)
+                {
+                DSOerr(DSO_F_BEOS_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
+                return(0);
+                }
+        if(sk_num(dso->meth_data) < 1)
+                return(1);
+        id = (image_id)sk_pop(dso->meth_data);
+        if(id < 1)
+                {
+                DSOerr(DSO_F_BEOS_UNLOAD,DSO_R_NULL_HANDLE);
+                return(0);
+                }
+        if(unload_add_on(id) != B_OK)
+                {
+                DSOerr(DSO_F_BEOS_UNLOAD,DSO_R_UNLOAD_FAILED);
+                /* We should push the value back onto the stack in
+                 * case of a retry. */
+                sk_push(dso->meth_data, (char *)id);
+                return(0);
+                }
+        return(1);
+        }
+
+static void *beos_bind_var(DSO *dso, const char *symname)
+        {
+        image_id id;
+        void *sym;
+
+        if((dso == NULL) || (symname == NULL))
+                {
+                DSOerr(DSO_F_BEOS_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
+                return(NULL);
+                }
+        if(sk_num(dso->meth_data) < 1)
+                {
+                DSOerr(DSO_F_BEOS_BIND_VAR,DSO_R_STACK_ERROR);
+                return(NULL);
+                }
+        id = (image_id)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
+        if(id < 1)
+                {
+                DSOerr(DSO_F_BEOS_BIND_VAR,DSO_R_NULL_HANDLE);
+                return(NULL);
+                }
+        if(get_image_symbol(id, symname, B_SYMBOL_TYPE_DATA, &sym) != B_OK)
+                {
+                DSOerr(DSO_F_BEOS_BIND_VAR,DSO_R_SYM_FAILURE);
+                ERR_add_error_data(3, "symname(", symname, ")");
+                return(NULL);
+                }
+        return(sym);
+        }
+
+static DSO_FUNC_TYPE beos_bind_func(DSO *dso, const char *symname)
+        {
+        image_id id;
+        void *sym;
+
+        if((dso == NULL) || (symname == NULL))
+                {
+                DSOerr(DSO_F_BEOS_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
+                return(NULL);
+                }
+        if(sk_num(dso->meth_data) < 1)
+                {
+                DSOerr(DSO_F_BEOS_BIND_FUNC,DSO_R_STACK_ERROR);
+                return(NULL);
+                }
+        id = (image_id)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
+        if(id < 1)
+                {
+                DSOerr(DSO_F_BEOS_BIND_FUNC,DSO_R_NULL_HANDLE);
+                return(NULL);
+                }
+        if(get_image_symbol(id, symname, B_SYMBOL_TYPE_TEXT, &sym) != B_OK)
+                {
+                DSOerr(DSO_F_BEOS_BIND_FUNC,DSO_R_SYM_FAILURE);
+                ERR_add_error_data(3, "symname(", symname, ")");
+                return(NULL);
+                }
+        return((DSO_FUNC_TYPE)sym);
+        }
+
+/* This one is the same as the one in dlfcn */
+static char *beos_name_converter(DSO *dso, const char *filename)
+        {
+        char *translated;
+        int len, rsize, transform;
+
+        len = strlen(filename);
+        rsize = len + 1;
+        transform = (strstr(filename, "/") == NULL);
+        if(transform)
+                {
+                /* We will convert this to "%s.so" or "lib%s.so" */
+                rsize += 3;     /* The length of ".so" */
+                if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
+                        rsize += 3; /* The length of "lib" */
+                }
+        translated = OPENSSL_malloc(rsize);
+        if(translated == NULL)
+                {
+                DSOerr(DSO_F_BEOS_NAME_CONVERTER,
+                                DSO_R_NAME_TRANSLATION_FAILED);
+                return(NULL);
+                }
+        if(transform)
+                {
+                if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
+                        sprintf(translated, "lib%s.so", filename);
+                else
+                        sprintf(translated, "%s.so", filename);
+                }
+        else
+                sprintf(translated, "%s", filename);
+        return(translated);
+        }
+
+#endif
diff --git a/src/lib/libcrypto/dyn_lck.c b/src/lib/libcrypto/dyn_lck.c
deleted file mode 100644
index 7f82c41264..0000000000
--- a/src/lib/libcrypto/dyn_lck.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/* crypto/cryptlib.c */
-/* ====================================================================
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#include "cryptlib.h"
-#include <openssl/safestack.h>
-
-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
-static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
-#endif
-
-DECLARE_STACK_OF(CRYPTO_dynlock)
-IMPLEMENT_STACK_OF(CRYPTO_dynlock)
-
-/* real #defines in crypto.h, keep these upto date */
-static const char* const lock_names[CRYPTO_NUM_LOCKS] =
-        {
-        "<<ERROR>>",
-        "err",
-        "ex_data",
-        "x509",
-        "x509_info",
-        "x509_pkey",
-        "x509_crl",
-        "x509_req",
-        "dsa",
-        "rsa",
-        "evp_pkey",
-        "x509_store",
-        "ssl_ctx",
-        "ssl_cert",
-        "ssl_session",
-        "ssl_sess_cert",
-        "ssl",
-        "ssl_method",
-        "rand",
-        "rand2",
-        "debug_malloc",
-        "BIO",
-        "gethostbyname",
-        "getservbyname",
-        "readdir",
-        "RSA_blinding",
-        "dh",
-        "debug_malloc2",
-        "dso",
-        "dynlock",
-        "engine",
-        "ui",
-        "ecdsa",
-        "ec",
-        "ecdh",
-        "bn",
-        "ec_pre_comp",
-        "store",
-        "comp",
-#ifndef OPENSSL_FIPS
-# if CRYPTO_NUM_LOCKS != 39
-#  error "Inconsistency between crypto.h and cryptlib.c"
-# endif
-#else
-        "fips",
-        "fips2",
-# if CRYPTO_NUM_LOCKS != 41
-#  error "Inconsistency between crypto.h and cryptlib.c"
-# endif
-#endif
-        };
-
-/* This is for applications to allocate new type names in the non-dynamic
-   array of lock names.  These are numbered with positive numbers.  */
-static STACK *app_locks=NULL;
-
-/* For applications that want a more dynamic way of handling threads, the
-   following stack is used.  These are externally numbered with negative
-   numbers.  */
-static STACK_OF(CRYPTO_dynlock) *dyn_locks=NULL;
-
-
-static struct CRYPTO_dynlock_value *(MS_FAR *dynlock_create_callback)
-        (const char *file,int line)=NULL;
-static void (MS_FAR *dynlock_lock_callback)(int mode,
-        struct CRYPTO_dynlock_value *l, const char *file,int line)=NULL;
-static void (MS_FAR *dynlock_destroy_callback)(struct CRYPTO_dynlock_value *l,
-        const char *file,int line)=NULL;
-
-int CRYPTO_get_new_lockid(char *name)
-        {
-        char *str;
-        int i;
-
-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
-        /* A hack to make Visual C++ 5.0 work correctly when linking as
-         * a DLL using /MT. Without this, the application cannot use
-         * and floating point printf's.
-         * It also seems to be needed for Visual C 1.5 (win16) */
-        SSLeay_MSVC5_hack=(double)name[0]*(double)name[1];
-#endif
-
-        if ((app_locks == NULL) && ((app_locks=sk_new_null()) == NULL))
-                {
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        if ((str=BUF_strdup(name)) == NULL)
-                {
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        i=sk_push(app_locks,str);
-        if (!i)
-                OPENSSL_free(str);
-        else
-                i+=CRYPTO_NUM_LOCKS; /* gap of one :-) */
-        return(i);
-        }
-
-int CRYPTO_get_new_dynlockid(void)
-        {
-        int i = 0;
-        CRYPTO_dynlock *pointer = NULL;
-
-        if (dynlock_create_callback == NULL)
-                {
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK);
-                return(0);
-                }
-        CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);
-        if ((dyn_locks == NULL)
-                && ((dyn_locks=sk_CRYPTO_dynlock_new_null()) == NULL))
-                {
-                CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
-
-        pointer = (CRYPTO_dynlock *)OPENSSL_malloc(sizeof(CRYPTO_dynlock));
-        if (pointer == NULL)
-                {
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        pointer->references = 1;
-        pointer->data = dynlock_create_callback(__FILE__,__LINE__);
-        if (pointer->data == NULL)
-                {
-                OPENSSL_free(pointer);
-                CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-
-        CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);
-        /* First, try to find an existing empty slot */
-        i=sk_CRYPTO_dynlock_find(dyn_locks,NULL);
-        /* If there was none, push, thereby creating a new one */
-        if (i == -1)
-                /* Since sk_push() returns the number of items on the
-                   stack, not the location of the pushed item, we need
-                   to transform the returned number into a position,
-                   by decreasing it.  */
-                i=sk_CRYPTO_dynlock_push(dyn_locks,pointer) - 1;
-        else
-                /* If we found a place with a NULL pointer, put our pointer
-                   in it.  */
-                (void)sk_CRYPTO_dynlock_set(dyn_locks,i,pointer);
-        CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
-
-        if (i == -1)
-                {
-                dynlock_destroy_callback(pointer->data,__FILE__,__LINE__);
-                OPENSSL_free(pointer);
-                }
-        else
-                i += 1; /* to avoid 0 */
-        return -i;
-        }
-
-void CRYPTO_destroy_dynlockid(int i)
-        {
-        CRYPTO_dynlock *pointer = NULL;
-        if (i)
-                i = -i-1;
-        if (dynlock_destroy_callback == NULL)
-                return;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);
-
-        if (dyn_locks == NULL || i >= sk_CRYPTO_dynlock_num(dyn_locks))
-                {
-                CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
-                return;
-                }
-        pointer = sk_CRYPTO_dynlock_value(dyn_locks, i);
-        if (pointer != NULL)
-                {
-                --pointer->references;
-#ifdef REF_CHECK
-                if (pointer->references < 0)
-                        {
-                        fprintf(stderr,"CRYPTO_destroy_dynlockid, bad reference count\n");
-                        abort();
-                        }
-                else
-#endif
-                        if (pointer->references <= 0)
-                                {
-                                (void)sk_CRYPTO_dynlock_set(dyn_locks, i, NULL);
-                                }
-                        else
-                                pointer = NULL;
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
-
-        if (pointer)
-                {
-                dynlock_destroy_callback(pointer->data,__FILE__,__LINE__);
-                OPENSSL_free(pointer);
-                }
-        }
-
-struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i)
-        {
-        CRYPTO_dynlock *pointer = NULL;
-        if (i)
-                i = -i-1;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);
-
-        if (dyn_locks != NULL && i < sk_CRYPTO_dynlock_num(dyn_locks))
-                pointer = sk_CRYPTO_dynlock_value(dyn_locks, i);
-        if (pointer)
-                pointer->references++;
-
-        CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
-
-        if (pointer)
-                return pointer->data;
-        return NULL;
-        }
-
-struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))
-        (const char *file,int line)
-        {
-        return(dynlock_create_callback);
-        }
-
-void (*CRYPTO_get_dynlock_lock_callback(void))(int mode,
-        struct CRYPTO_dynlock_value *l, const char *file,int line)
-        {
-        return(dynlock_lock_callback);
-        }
-
-void (*CRYPTO_get_dynlock_destroy_callback(void))
-        (struct CRYPTO_dynlock_value *l, const char *file,int line)
-        {
-        return(dynlock_destroy_callback);
-        }
-
-void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(*func)
-        (const char *file, int line))
-        {
-        dynlock_create_callback=func;
-        }
-
-static void do_dynlock(int mode, int type, const char *file, int line)
-        {
-        if (dynlock_lock_callback != NULL)
-                {
-                struct CRYPTO_dynlock_value *pointer
-                                = CRYPTO_get_dynlock_value(type);
-
-                OPENSSL_assert(pointer != NULL);
-
-                dynlock_lock_callback(mode, pointer, file, line);
-
-                CRYPTO_destroy_dynlockid(type);
-                }
-        }
-
-void CRYPTO_set_dynlock_lock_callback(void (*func)(int mode,
-        struct CRYPTO_dynlock_value *l, const char *file, int line))
-        {
-        /* Set callback so CRYPTO_lock() can now handle dynamic locks.
-         * This is OK because at this point and application shouldn't be using
-         * OpenSSL from multiple threads because it is setting up the locking
-         * callbacks.
-         */
-        static int done = 0;
-        if (!done)
-                {
-                int_CRYPTO_set_do_dynlock_callback(do_dynlock);
-                done = 1;
-                }
-                
-        dynlock_lock_callback=func;
-        }
-
-void CRYPTO_set_dynlock_destroy_callback(void (*func)
-        (struct CRYPTO_dynlock_value *l, const char *file, int line))
-        {
-        dynlock_destroy_callback=func;
-        }
-
-const char *CRYPTO_get_lock_name(int type)
-        {
-        if (type < 0)
-                return("dynamic");
-        else if (type < CRYPTO_NUM_LOCKS)
-                return(lock_names[type]);
-        else if (type-CRYPTO_NUM_LOCKS > sk_num(app_locks))
-                return("ERROR");
-        else
-                return(sk_value(app_locks,type-CRYPTO_NUM_LOCKS));
-        }
-
diff --git a/src/lib/libcrypto/ec/ecp_recp.c b/src/lib/libcrypto/ec/ecp_recp.c
deleted file mode 100644
index fec843b5c8..0000000000
--- a/src/lib/libcrypto/ec/ecp_recp.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* crypto/ec/ecp_recp.c */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include "ec_lcl.h"
-
-#if 0
-const EC_METHOD *EC_GFp_recp_method(void)
-        {
-        static const EC_METHOD ret = {
-                ec_GFp_recp_group_init,
-                ec_GFp_recp_group_finish,
-                ec_GFp_recp_group_clear_finish,
-                ec_GFp_recp_group_copy,
-                ec_GFp_recp_group_set_curve_GFp,
-                ec_GFp_simple_group_get_curve_GFp,
-                ec_GFp_simple_group_set_generator,
-                ec_GFp_simple_group_get0_generator,
-                ec_GFp_simple_group_get_order,
-                ec_GFp_simple_group_get_cofactor,
-                ec_GFp_simple_point_init,
-                ec_GFp_simple_point_finish,
-                ec_GFp_simple_point_clear_finish,
-                ec_GFp_simple_point_copy,
-                ec_GFp_simple_point_set_to_infinity,
-                ec_GFp_simple_set_Jprojective_coordinates_GFp,
-                ec_GFp_simple_get_Jprojective_coordinates_GFp,
-                ec_GFp_simple_point_set_affine_coordinates_GFp,
-                ec_GFp_simple_point_get_affine_coordinates_GFp,
-                ec_GFp_simple_set_compressed_coordinates_GFp,
-                ec_GFp_simple_point2oct,
-                ec_GFp_simple_oct2point,
-                ec_GFp_simple_add,
-                ec_GFp_simple_dbl,
-                ec_GFp_simple_invert,
-                ec_GFp_simple_is_at_infinity,
-                ec_GFp_simple_is_on_curve,
-                ec_GFp_simple_cmp,
-                ec_GFp_simple_make_affine,
-                ec_GFp_simple_points_make_affine,
-                ec_GFp_recp_field_mul,
-                ec_GFp_recp_field_sqr,
-                0 /* field_encode */,
-                0 /* field_decode */,
-                0 /* field_set_to_one */ };
-
-        return &ret;
-        }
-#endif
-
-int ec_GFp_recp_group_init(EC_GROUP *group)
-        {
-        int ok;
-
-        ok = ec_GFp_simple_group_init(group);
-        group->field_data1 = NULL;
-        return ok;
-        }
-
-
-int ec_GFp_recp_group_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
-
-
-void ec_GFp_recp_group_finish(EC_GROUP *group);
-/* TODO */
-
-
-void ec_GFp_recp_group_clear_finish(EC_GROUP *group);
-/* TODO */
-
-
-int ec_GFp_recp_group_copy(EC_GROUP *dest, const EC_GROUP *src);
-/* TODO */
-
-
-int ec_GFp_recp_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
-
-
-int ec_GFp_recp_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */
diff --git a/src/lib/libcrypto/ecdh/Makefile b/src/lib/libcrypto/ecdh/Makefile
new file mode 100644
index 0000000000..65d8904ee8
--- /dev/null
+++ b/src/lib/libcrypto/ecdh/Makefile
@@ -0,0 +1,121 @@
+#
+# crypto/ecdh/Makefile
+#
+
+DIR=    ecdh
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g -Wall
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=ecdhtest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= ech_lib.c ech_ossl.c ech_key.c ech_err.c
+
+LIBOBJ= ech_lib.o ech_ossl.o ech_key.o ech_err.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= ecdh.h
+HEADER= ech_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+ech_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ech_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ech_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ech_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ech_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ech_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+ech_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ech_err.o: ech_err.c
+ech_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ech_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ech_key.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ech_key.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ech_key.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
+ech_key.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ech_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+ech_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ech_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+ech_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ech_key.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ech_key.o: ../../include/openssl/x509_vfy.h ech_key.c ech_locl.h
+ech_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ech_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ech_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ech_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ech_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+ech_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+ech_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ech_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ech_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ech_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ech_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ech_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ech_lib.o: ech_lib.c ech_locl.h
+ech_ossl.o: ../../e_os.h ../../include/openssl/asn1.h
+ech_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+ech_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ech_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ech_ossl.o: ../../include/openssl/ecdh.h ../../include/openssl/err.h
+ech_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ech_ossl.o: ../../include/openssl/opensslconf.h
+ech_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ech_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ech_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ech_ossl.o: ../cryptlib.h ech_locl.h ech_ossl.c
diff --git a/src/lib/libcrypto/ecdh/ecdhtest.c b/src/lib/libcrypto/ecdh/ecdhtest.c
new file mode 100644
index 0000000000..212a87efa4
--- /dev/null
+++ b/src/lib/libcrypto/ecdh/ecdhtest.c
@@ -0,0 +1,368 @@
+/* crypto/ecdh/ecdhtest.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../e_os.h"
+
+#include <openssl/opensslconf.h>        /* for OPENSSL_NO_ECDH */
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/objects.h>
+#include <openssl/rand.h>
+#include <openssl/sha.h>
+#include <openssl/err.h>
+
+#ifdef OPENSSL_NO_ECDH
+int main(int argc, char *argv[])
+{
+    printf("No ECDH support\n");
+    return(0);
+}
+#else
+#include <openssl/ec.h>
+#include <openssl/ecdh.h>
+
+#ifdef OPENSSL_SYS_WIN16
+#define MS_CALLBACK     _far _loadds
+#else
+#define MS_CALLBACK
+#endif
+
+#if 0
+static void MS_CALLBACK cb(int p, int n, void *arg);
+#endif
+
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";
+
+
+static const int KDF1_SHA1_len = 20;
+static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen)
+        {
+#ifndef OPENSSL_NO_SHA
+        if (*outlen < SHA_DIGEST_LENGTH)
+                return NULL;
+        else
+                *outlen = SHA_DIGEST_LENGTH;
+        return SHA1(in, inlen, out);
+#else
+        return NULL;
+#endif
+        }
+
+
+static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
+        {
+        EC_KEY *a=NULL;
+        EC_KEY *b=NULL;
+        BIGNUM *x_a=NULL, *y_a=NULL,
+               *x_b=NULL, *y_b=NULL;
+        char buf[12];
+        unsigned char *abuf=NULL,*bbuf=NULL;
+        int i,alen,blen,aout,bout,ret=0;
+        const EC_GROUP *group;
+
+        a = EC_KEY_new_by_curve_name(nid);
+        b = EC_KEY_new_by_curve_name(nid);
+        if (a == NULL || b == NULL)
+                goto err;
+
+        group = EC_KEY_get0_group(a);
+
+        if ((x_a=BN_new()) == NULL) goto err;
+        if ((y_a=BN_new()) == NULL) goto err;
+        if ((x_b=BN_new()) == NULL) goto err;
+        if ((y_b=BN_new()) == NULL) goto err;
+
+        BIO_puts(out,"Testing key generation with ");
+        BIO_puts(out,text);
+#ifdef NOISY
+        BIO_puts(out,"\n");
+#else
+        (void)BIO_flush(out);
+#endif
+
+        if (!EC_KEY_generate_key(a)) goto err;
+        
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
+                {
+                if (!EC_POINT_get_affine_coordinates_GFp(group,
+                        EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group,
+                        EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
+                }
+#ifdef NOISY
+        BIO_puts(out,"  pri 1=");
+        BN_print(out,a->priv_key);
+        BIO_puts(out,"\n  pub 1=");
+        BN_print(out,x_a);
+        BIO_puts(out,",");
+        BN_print(out,y_a);
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out," .");
+        (void)BIO_flush(out);
+#endif
+
+        if (!EC_KEY_generate_key(b)) goto err;
+
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
+                {
+                if (!EC_POINT_get_affine_coordinates_GFp(group, 
+                        EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, 
+                        EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
+                }
+
+#ifdef NOISY
+        BIO_puts(out,"  pri 2=");
+        BN_print(out,b->priv_key);
+        BIO_puts(out,"\n  pub 2=");
+        BN_print(out,x_b);
+        BIO_puts(out,",");
+        BN_print(out,y_b);
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out,".");
+        (void)BIO_flush(out);
+#endif
+
+        alen=KDF1_SHA1_len;
+        abuf=(unsigned char *)OPENSSL_malloc(alen);
+        aout=ECDH_compute_key(abuf,alen,EC_KEY_get0_public_key(b),a,KDF1_SHA1);
+
+#ifdef NOISY
+        BIO_puts(out,"  key1 =");
+        for (i=0; i<aout; i++)
+                {
+                sprintf(buf,"%02X",abuf[i]);
+                BIO_puts(out,buf);
+                }
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out,".");
+        (void)BIO_flush(out);
+#endif
+
+        blen=KDF1_SHA1_len;
+        bbuf=(unsigned char *)OPENSSL_malloc(blen);
+        bout=ECDH_compute_key(bbuf,blen,EC_KEY_get0_public_key(a),b,KDF1_SHA1);
+
+#ifdef NOISY
+        BIO_puts(out,"  key2 =");
+        for (i=0; i<bout; i++)
+                {
+                sprintf(buf,"%02X",bbuf[i]);
+                BIO_puts(out,buf);
+                }
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out,".");
+        (void)BIO_flush(out);
+#endif
+
+        if ((aout < 4) || (bout != aout) || (memcmp(abuf,bbuf,aout) != 0))
+                {
+#ifndef NOISY
+                BIO_printf(out, " failed\n\n");
+                BIO_printf(out, "key a:\n");
+                BIO_printf(out, "private key: ");
+                BN_print(out, EC_KEY_get0_private_key(a));
+                BIO_printf(out, "\n");
+                BIO_printf(out, "public key (x,y): ");
+                BN_print(out, x_a);
+                BIO_printf(out, ",");
+                BN_print(out, y_a);
+                BIO_printf(out, "\nkey b:\n");
+                BIO_printf(out, "private key: ");
+                BN_print(out, EC_KEY_get0_private_key(b));
+                BIO_printf(out, "\n");
+                BIO_printf(out, "public key (x,y): ");
+                BN_print(out, x_b);
+                BIO_printf(out, ",");
+                BN_print(out, y_b);
+                BIO_printf(out, "\n");
+                BIO_printf(out, "generated key a: ");
+                for (i=0; i<bout; i++)
+                        {
+                        sprintf(buf, "%02X", bbuf[i]);
+                        BIO_puts(out, buf);
+                        }
+                BIO_printf(out, "\n");
+                BIO_printf(out, "generated key b: ");
+                for (i=0; i<aout; i++)
+                        {
+                        sprintf(buf, "%02X", abuf[i]);
+                        BIO_puts(out,buf);
+                        }
+                BIO_printf(out, "\n");
+#endif
+                fprintf(stderr,"Error in ECDH routines\n");
+                ret=0;
+                }
+        else
+                {
+#ifndef NOISY
+                BIO_printf(out, " ok\n");
+#endif
+                ret=1;
+                }
+err:
+        ERR_print_errors_fp(stderr);
+
+        if (abuf != NULL) OPENSSL_free(abuf);
+        if (bbuf != NULL) OPENSSL_free(bbuf);
+        if (x_a) BN_free(x_a);
+        if (y_a) BN_free(y_a);
+        if (x_b) BN_free(x_b);
+        if (y_b) BN_free(y_b);
+        if (b) EC_KEY_free(b);
+        if (a) EC_KEY_free(a);
+        return(ret);
+        }
+
+int main(int argc, char *argv[])
+        {
+        BN_CTX *ctx=NULL;
+        int ret=1;
+        BIO *out;
+
+        CRYPTO_malloc_debug_init();
+        CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
+        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+#ifdef OPENSSL_SYS_WIN32
+        CRYPTO_malloc_init();
+#endif
+
+        RAND_seed(rnd_seed, sizeof rnd_seed);
+
+        out=BIO_new(BIO_s_file());
+        if (out == NULL) EXIT(1);
+        BIO_set_fp(out,stdout,BIO_NOCLOSE);
+
+        if ((ctx=BN_CTX_new()) == NULL) goto err;
+
+        /* NIST PRIME CURVES TESTS */
+        if (!test_ecdh_curve(NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_secp384r1, "NIST Prime-Curve P-384", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_secp521r1, "NIST Prime-Curve P-521", ctx, out)) goto err;
+        /* NIST BINARY CURVES TESTS */
+        if (!test_ecdh_curve(NID_sect163k1, "NIST Binary-Curve K-163", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect163r2, "NIST Binary-Curve B-163", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect233k1, "NIST Binary-Curve K-233", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect233r1, "NIST Binary-Curve B-233", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect283k1, "NIST Binary-Curve K-283", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect283r1, "NIST Binary-Curve B-283", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect409k1, "NIST Binary-Curve K-409", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect409r1, "NIST Binary-Curve B-409", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect571k1, "NIST Binary-Curve K-571", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out)) goto err;
+
+        ret = 0;
+
+err:
+        ERR_print_errors_fp(stderr);
+        if (ctx) BN_CTX_free(ctx);
+        BIO_free(out);
+        CRYPTO_cleanup_all_ex_data();
+        ERR_remove_thread_state(NULL);
+        CRYPTO_mem_leaks_fp(stderr);
+        EXIT(ret);
+        return(ret);
+        }
+
+#if 0
+static void MS_CALLBACK cb(int p, int n, void *arg)
+        {
+        char c='*';
+
+        if (p == 0) c='.';
+        if (p == 1) c='+';
+        if (p == 2) c='*';
+        if (p == 3) c='\n';
+        BIO_write((BIO *)arg,&c,1);
+        (void)BIO_flush((BIO *)arg);
+#ifdef LINT
+        p=n;
+#endif
+        }
+#endif
+#endif
diff --git a/src/lib/libcrypto/ecdh/ech_ossl.c b/src/lib/libcrypto/ecdh/ech_ossl.c
new file mode 100644
index 0000000000..2a40ff12df
--- /dev/null
+++ b/src/lib/libcrypto/ecdh/ech_ossl.c
@@ -0,0 +1,213 @@
+/* crypto/ecdh/ech_ossl.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#include <string.h>
+#include <limits.h>
+
+#include "cryptlib.h"
+
+#include "ech_locl.h"
+#include <openssl/err.h>
+#include <openssl/sha.h>
+#include <openssl/obj_mac.h>
+#include <openssl/bn.h>
+
+static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key,
+        EC_KEY *ecdh, 
+        void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
+
+static ECDH_METHOD openssl_ecdh_meth = {
+        "OpenSSL ECDH method",
+        ecdh_compute_key,
+#if 0
+        NULL, /* init     */
+        NULL, /* finish   */
+#endif
+        0,    /* flags    */
+        NULL  /* app_data */
+};
+
+const ECDH_METHOD *ECDH_OpenSSL(void)
+        {
+        return &openssl_ecdh_meth;
+        }
+
+
+/* This implementation is based on the following primitives in the IEEE 1363 standard:
+ *  - ECKAS-DH1
+ *  - ECSVDP-DH
+ * Finally an optional KDF is applied.
+ */
+static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
+        EC_KEY *ecdh,
+        void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
+        {
+        BN_CTX *ctx;
+        EC_POINT *tmp=NULL;
+        BIGNUM *x=NULL, *y=NULL;
+        const BIGNUM *priv_key;
+        const EC_GROUP* group;
+        int ret= -1;
+        size_t buflen, len;
+        unsigned char *buf=NULL;
+
+        if (outlen > INT_MAX)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE); /* sort of, anyway */
+                return -1;
+                }
+
+        if ((ctx = BN_CTX_new()) == NULL) goto err;
+        BN_CTX_start(ctx);
+        x = BN_CTX_get(ctx);
+        y = BN_CTX_get(ctx);
+        
+        priv_key = EC_KEY_get0_private_key(ecdh);
+        if (priv_key == NULL)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_NO_PRIVATE_VALUE);
+                goto err;
+                }
+
+        group = EC_KEY_get0_group(ecdh);
+        if ((tmp=EC_POINT_new(group)) == NULL)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) 
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+                goto err;
+                }
+                
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
+                {
+                if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y, ctx)) 
+                        {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+                        goto err;
+                        }
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) 
+                        {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+                        goto err;
+                        }
+                }
+
+        buflen = (EC_GROUP_get_degree(group) + 7)/8;
+        len = BN_num_bytes(x);
+        if (len > buflen)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_INTERNAL_ERROR);
+                goto err;
+                }
+        if ((buf = OPENSSL_malloc(buflen)) == NULL)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        
+        memset(buf, 0, buflen - len);
+        if (len != (size_t)BN_bn2bin(x, buf + buflen - len))
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_BN_LIB);
+                goto err;
+                }
+
+        if (KDF != 0)
+                {
+                if (KDF(buf, buflen, out, &outlen) == NULL)
+                        {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_KDF_FAILED);
+                        goto err;
+                        }
+                ret = outlen;
+                }
+        else
+                {
+                /* no KDF, just copy as much as we can */
+                if (outlen > buflen)
+                        outlen = buflen;
+                memcpy(out, buf, outlen);
+                ret = outlen;
+                }
+        
+err:
+        if (tmp) EC_POINT_free(tmp);
+        if (ctx) BN_CTX_end(ctx);
+        if (ctx) BN_CTX_free(ctx);
+        if (buf) OPENSSL_free(buf);
+        return(ret);
+        }
diff --git a/src/lib/libcrypto/ecdsa/Makefile b/src/lib/libcrypto/ecdsa/Makefile
new file mode 100644
index 0000000000..e89e0c010c
--- /dev/null
+++ b/src/lib/libcrypto/ecdsa/Makefile
@@ -0,0 +1,140 @@
+#
+# crypto/ecdsa/Makefile
+#
+
+DIR=    ecdsa
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g -Wall
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=ecdsatest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c
+
+LIBOBJ= ecs_lib.o ecs_asn1.o ecs_ossl.o ecs_sign.o ecs_vrf.o ecs_err.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= ecdsa.h
+HEADER= ecs_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+ecs_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+ecs_asn1.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+ecs_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ecs_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+ecs_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecs_asn1.o: ../../include/openssl/symhacks.h ecs_asn1.c ecs_locl.h
+ecs_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ecs_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+ecs_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ecs_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ecs_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+ecs_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ecs_err.o: ecs_err.c
+ecs_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+ecs_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ecs_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ecs_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+ecs_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ecs_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ecs_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+ecs_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+ecs_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ecs_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ecs_lib.o: ../../include/openssl/x509_vfy.h ecs_lib.c ecs_locl.h
+ecs_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ecs_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_ossl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ecs_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ecs_ossl.o: ../../include/openssl/opensslconf.h
+ecs_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecs_ossl.o: ../../include/openssl/symhacks.h ecs_locl.h ecs_ossl.c
+ecs_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ecs_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ecs_sign.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
+ecs_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ecs_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+ecs_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ecs_sign.o: ecs_locl.h ecs_sign.c
+ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
+ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c
diff --git a/src/lib/libcrypto/ecdsa/ecdsatest.c b/src/lib/libcrypto/ecdsa/ecdsatest.c
new file mode 100644
index 0000000000..aa4e1481a8
--- /dev/null
+++ b/src/lib/libcrypto/ecdsa/ecdsatest.c
@@ -0,0 +1,500 @@
+/* crypto/ecdsa/ecdsatest.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * The elliptic curve binary polynomial software is originally written by 
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ECDSA is defined */
+
+#ifdef OPENSSL_NO_ECDSA
+int main(int argc, char * argv[])
+        {
+        puts("Elliptic curves are disabled.");
+        return 0;
+        }
+#else
+
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#include <openssl/ecdsa.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/err.h>
+#include <openssl/rand.h>
+
+static const char rnd_seed[] = "string to make the random number generator "
+        "think it has entropy";
+
+/* declaration of the test functions */
+int x9_62_tests(BIO *);
+int x9_62_test_internal(BIO *out, int nid, const char *r, const char *s);
+int test_builtin(BIO *);
+
+/* functions to change the RAND_METHOD */
+int change_rand(void);
+int restore_rand(void);
+int fbytes(unsigned char *buf, int num);
+
+RAND_METHOD     fake_rand;
+const RAND_METHOD *old_rand;
+
+int change_rand(void)
+        {
+        /* save old rand method */
+        if ((old_rand = RAND_get_rand_method()) == NULL)
+                return 0;
+
+        fake_rand.seed    = old_rand->seed;
+        fake_rand.cleanup = old_rand->cleanup;
+        fake_rand.add     = old_rand->add;
+        fake_rand.status  = old_rand->status;
+        /* use own random function */
+        fake_rand.bytes      = fbytes;
+        fake_rand.pseudorand = old_rand->bytes;
+        /* set new RAND_METHOD */
+        if (!RAND_set_rand_method(&fake_rand))
+                return 0;
+        return 1;
+        }
+
+int restore_rand(void)
+        {
+        if (!RAND_set_rand_method(old_rand))
+                return 0;
+        else
+                return 1;
+        }
+
+static int fbytes_counter = 0;
+static const char *numbers[8] = {
+        "651056770906015076056810763456358567190100156695615665659",
+        "6140507067065001063065065565667405560006161556565665656654",
+        "8763001015071075675010661307616710783570106710677817767166"
+        "71676178726717",
+        "7000000175690566466555057817571571075705015757757057795755"
+        "55657156756655",
+        "1275552191113212300012030439187146164646146646466749494799",
+        "1542725565216523985789236956265265265235675811949404040041",
+        "1456427555219115346513212300075341203043918714616464614664"
+        "64667494947990",
+        "1712787255652165239672857892369562652652652356758119494040"
+        "40041670216363"};
+
+int fbytes(unsigned char *buf, int num)
+        {
+        int     ret;
+        BIGNUM  *tmp = NULL;
+
+        if (fbytes_counter >= 8)
+                return 0;
+        tmp = BN_new();
+        if (!tmp)
+                return 0;
+        if (!BN_dec2bn(&tmp, numbers[fbytes_counter]))
+                {
+                BN_free(tmp);
+                return 0;
+                }
+        fbytes_counter ++;
+        ret = BN_bn2bin(tmp, buf);      
+        if (ret == 0 || ret != num)
+                ret = 0;
+        else
+                ret = 1;
+        if (tmp)
+                BN_free(tmp);
+        return ret;
+        }
+
+/* some tests from the X9.62 draft */
+int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
+        {
+        int     ret = 0;
+        const char message[] = "abc";
+        unsigned char digest[20];
+        unsigned int  dgst_len = 0;
+        EVP_MD_CTX md_ctx;
+        EC_KEY    *key = NULL;
+        ECDSA_SIG *signature = NULL;
+        BIGNUM    *r = NULL, *s = NULL;
+
+        EVP_MD_CTX_init(&md_ctx);
+        /* get the message digest */
+        EVP_DigestInit(&md_ctx, EVP_ecdsa());
+        EVP_DigestUpdate(&md_ctx, (const void*)message, 3);
+        EVP_DigestFinal(&md_ctx, digest, &dgst_len);
+
+        BIO_printf(out, "testing %s: ", OBJ_nid2sn(nid));
+        /* create the key */
+        if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
+                goto x962_int_err;
+        if (!EC_KEY_generate_key(key))
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+        /* create the signature */
+        signature = ECDSA_do_sign(digest, 20, key);
+        if (signature == NULL)
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+        /* compare the created signature with the expected signature */
+        if ((r = BN_new()) == NULL || (s = BN_new()) == NULL)
+                goto x962_int_err;
+        if (!BN_dec2bn(&r, r_in) ||
+            !BN_dec2bn(&s, s_in))
+                goto x962_int_err;
+        if (BN_cmp(signature->r ,r) || BN_cmp(signature->s, s))
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+        /* verify the signature */
+        if (ECDSA_do_verify(digest, 20, signature, key) != 1)
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+
+        BIO_printf(out, " ok\n");
+        ret = 1;
+x962_int_err:
+        if (!ret)
+                BIO_printf(out, " failed\n");
+        if (key)
+                EC_KEY_free(key);
+        if (signature)
+                ECDSA_SIG_free(signature);
+        if (r)
+                BN_free(r);
+        if (s)
+                BN_free(s);
+        EVP_MD_CTX_cleanup(&md_ctx);
+        return ret;
+        }
+
+int x9_62_tests(BIO *out)
+        {
+        int ret = 0;
+
+        BIO_printf(out, "some tests from X9.62:\n");
+
+        /* set own rand method */
+        if (!change_rand())
+                goto x962_err;
+
+        if (!x9_62_test_internal(out, NID_X9_62_prime192v1,
+                "3342403536405981729393488334694600415596881826869351677613",
+                "5735822328888155254683894997897571951568553642892029982342"))
+                goto x962_err;
+        if (!x9_62_test_internal(out, NID_X9_62_prime239v1,
+                "3086361431751678114926225473006680188549593787585317781474"
+                "62058306432176",
+                "3238135532097973577080787768312505059318910517550078427819"
+                "78505179448783"))
+                goto x962_err;
+        if (!x9_62_test_internal(out, NID_X9_62_c2tnb191v1,
+                "87194383164871543355722284926904419997237591535066528048",
+                "308992691965804947361541664549085895292153777025772063598"))
+                goto x962_err;
+        if (!x9_62_test_internal(out, NID_X9_62_c2tnb239v1,
+                "2159633321041961198501834003903461262881815148684178964245"
+                "5876922391552",
+                "1970303740007316867383349976549972270528498040721988191026"
+                "49413465737174"))
+                goto x962_err;
+
+        ret = 1;
+x962_err:
+        if (!restore_rand())
+                ret = 0;
+        return ret;
+        }
+
+int test_builtin(BIO *out)
+        {
+        EC_builtin_curve *curves = NULL;
+        size_t          crv_len = 0, n = 0;
+        EC_KEY          *eckey = NULL, *wrong_eckey = NULL;
+        EC_GROUP        *group;
+        unsigned char   digest[20], wrong_digest[20];
+        unsigned char   *signature = NULL; 
+        unsigned int    sig_len;
+        int             nid, ret =  0;
+        
+        /* fill digest values with some random data */
+        if (!RAND_pseudo_bytes(digest, 20) ||
+            !RAND_pseudo_bytes(wrong_digest, 20))
+                {
+                BIO_printf(out, "ERROR: unable to get random data\n");
+                goto builtin_err;
+                }
+
+        /* create and verify a ecdsa signature with every availble curve
+         * (with ) */
+        BIO_printf(out, "\ntesting ECDSA_sign() and ECDSA_verify() "
+                "with some internal curves:\n");
+
+        /* get a list of all internal curves */
+        crv_len = EC_get_builtin_curves(NULL, 0);
+
+        curves = OPENSSL_malloc(sizeof(EC_builtin_curve) * crv_len);
+
+        if (curves == NULL)
+                {
+                BIO_printf(out, "malloc error\n");
+                goto builtin_err;
+                }
+        
+        if (!EC_get_builtin_curves(curves, crv_len))
+                {
+                BIO_printf(out, "unable to get internal curves\n");
+                goto builtin_err;
+                }
+
+        /* now create and verify a signature for every curve */
+        for (n = 0; n < crv_len; n++)
+                {
+                unsigned char dirt, offset;
+
+                nid = curves[n].nid;
+                if (nid == NID_ipsec4)
+                        continue;
+                /* create new ecdsa key (== EC_KEY) */
+                if ((eckey = EC_KEY_new()) == NULL)
+                        goto builtin_err;
+                group = EC_GROUP_new_by_curve_name(nid);
+                if (group == NULL)
+                        goto builtin_err;
+                if (EC_KEY_set_group(eckey, group) == 0)
+                        goto builtin_err;
+                EC_GROUP_free(group);
+                if (EC_GROUP_get_degree(EC_KEY_get0_group(eckey)) < 160)
+                        /* drop the curve */ 
+                        {
+                        EC_KEY_free(eckey);
+                        eckey = NULL;
+                        continue;
+                        }
+                BIO_printf(out, "%s: ", OBJ_nid2sn(nid));
+                /* create key */
+                if (!EC_KEY_generate_key(eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                /* create second key */
+                if ((wrong_eckey = EC_KEY_new()) == NULL)
+                        goto builtin_err;
+                group = EC_GROUP_new_by_curve_name(nid);
+                if (group == NULL)
+                        goto builtin_err;
+                if (EC_KEY_set_group(wrong_eckey, group) == 0)
+                        goto builtin_err;
+                EC_GROUP_free(group);
+                if (!EC_KEY_generate_key(wrong_eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* check key */
+                if (!EC_KEY_check_key(eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* create signature */
+                sig_len = ECDSA_size(eckey);
+                if ((signature = OPENSSL_malloc(sig_len)) == NULL)
+                        goto builtin_err;
+                if (!ECDSA_sign(0, digest, 20, signature, &sig_len, eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* verify signature */
+                if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* verify signature with the wrong key */
+                if (ECDSA_verify(0, digest, 20, signature, sig_len, 
+                        wrong_eckey) == 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* wrong digest */
+                if (ECDSA_verify(0, wrong_digest, 20, signature, sig_len,
+                        eckey) == 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* modify a single byte of the signature */
+                offset = signature[10] % sig_len;
+                dirt   = signature[11];
+                signature[offset] ^= dirt ? dirt : 1; 
+                if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) == 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                
+                BIO_printf(out, " ok\n");
+                /* cleanup */
+                OPENSSL_free(signature);
+                signature = NULL;
+                EC_KEY_free(eckey);
+                eckey = NULL;
+                EC_KEY_free(wrong_eckey);
+                wrong_eckey = NULL;
+                }
+
+        ret = 1;        
+builtin_err:
+        if (eckey)
+                EC_KEY_free(eckey);
+        if (wrong_eckey)
+                EC_KEY_free(wrong_eckey);
+        if (signature)
+                OPENSSL_free(signature);
+        if (curves)
+                OPENSSL_free(curves);
+
+        return ret;
+        }
+
+int main(void)
+        {
+        int     ret = 1;
+        BIO     *out;
+
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
+        
+        /* enable memory leak checking unless explicitly disabled */
+        if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && 
+                (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))))
+                {
+                CRYPTO_malloc_debug_init();
+                CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+                }
+        else
+                {
+                /* OPENSSL_DEBUG_MEMORY=off */
+                CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
+                }
+        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+        ERR_load_crypto_strings();
+
+        /* initialize the prng */
+        RAND_seed(rnd_seed, sizeof(rnd_seed));
+
+        /* the tests */
+        if (!x9_62_tests(out))  goto err;
+        if (!test_builtin(out)) goto err;
+        
+        ret = 0;
+err:    
+        if (ret)        
+                BIO_printf(out, "\nECDSA test failed\n");
+        else 
+                BIO_printf(out, "\nECDSA test passed\n");
+        if (ret)
+                ERR_print_errors(out);
+        CRYPTO_cleanup_all_ex_data();
+        ERR_remove_thread_state(NULL);
+        ERR_free_strings();
+        CRYPTO_mem_leaks(out);
+        if (out != NULL)
+                BIO_free(out);
+        return ret;
+        }       
+#endif
diff --git a/src/lib/libcrypto/engine/hw.ec b/src/lib/libcrypto/engine/hw.ec
deleted file mode 100644
index 5481a43918..0000000000
--- a/src/lib/libcrypto/engine/hw.ec
+++ /dev/null
@@ -1,8 +0,0 @@
-L AEPHK         hw_aep_err.h                    hw_aep_err.c
-L ATALLA        hw_atalla_err.h                 hw_atalla_err.c
-L CSWIFT        hw_cswift_err.h                 hw_cswift_err.c
-L HWCRHK        hw_ncipher_err.h                hw_ncipher_err.c
-L NURON         hw_nuron_err.h                  hw_nuron_err.c
-L SUREWARE      hw_sureware_err.h               hw_sureware_err.c
-L UBSEC         hw_ubsec_err.h                  hw_ubsec_err.c
-L CCA4758       hw_4758_cca_err.h               hw_4758_cca_err.c
diff --git a/src/lib/libcrypto/engine/hw_4758_cca.c b/src/lib/libcrypto/engine/hw_4758_cca.c
deleted file mode 100644
index 4f5ae8a46d..0000000000
--- a/src/lib/libcrypto/engine/hw_4758_cca.c
+++ /dev/null
@@ -1,969 +0,0 @@
-/* Author: Maurice Gittens <maurice@gittens.nl>                       */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <openssl/crypto.h>
-/* #include <openssl/pem.h> */
-#include "cryptlib.h"
-#include <openssl/dso.h>
-#include <openssl/x509.h>
-#include <openssl/objects.h>
-#include <openssl/engine.h>
-
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_4758_CCA
-
-#ifdef FLAT_INC
-#include "hw_4758_cca.h"
-#else
-#include "vendor_defns/hw_4758_cca.h"
-#endif
-
-#include "hw_4758_cca_err.c"
-
-static int ibm_4758_cca_destroy(ENGINE *e);
-static int ibm_4758_cca_init(ENGINE *e);
-static int ibm_4758_cca_finish(ENGINE *e);
-static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
-
-/* rsa functions */
-/*---------------*/
-#ifndef OPENSSL_NO_RSA
-static int cca_rsa_pub_enc(int flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int cca_rsa_priv_dec(int flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
-                unsigned char *sigret, unsigned int *siglen, const RSA *rsa);
-static int cca_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len,
-                unsigned char *sigbuf, unsigned int siglen, const RSA *rsa);
-
-/* utility functions */
-/*-----------------------*/
-static EVP_PKEY *ibm_4758_load_privkey(ENGINE*, const char*,
-                UI_METHOD *ui_method, void *callback_data);
-static EVP_PKEY *ibm_4758_load_pubkey(ENGINE*, const char*,
-                UI_METHOD *ui_method, void *callback_data);
-
-static int getModulusAndExponent(const unsigned char *token, long *exponentLength,
-                unsigned char *exponent, long *modulusLength,
-                long *modulusFieldLength, unsigned char *modulus);
-#endif
-
-/* RAND number functions */
-/*-----------------------*/
-static int cca_get_random_bytes(unsigned char*, int );
-static int cca_random_status(void);
-
-static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-                int idx,long argl, void *argp);
-
-/* Function pointers for CCA verbs */
-/*---------------------------------*/
-#ifndef OPENSSL_NO_RSA
-static F_KEYRECORDREAD keyRecordRead;
-static F_DIGITALSIGNATUREGENERATE digitalSignatureGenerate;
-static F_DIGITALSIGNATUREVERIFY digitalSignatureVerify;
-static F_PUBLICKEYEXTRACT publicKeyExtract;
-static F_PKAENCRYPT pkaEncrypt;
-static F_PKADECRYPT pkaDecrypt;
-#endif
-static F_RANDOMNUMBERGENERATE randomNumberGenerate;
-
-/* static variables */
-/*------------------*/
-static const char *CCA4758_LIB_NAME = NULL;
-static const char *get_CCA4758_LIB_NAME(void)
-        {
-        if(CCA4758_LIB_NAME)
-                return CCA4758_LIB_NAME;
-        return CCA_LIB_NAME;
-        }
-static void free_CCA4758_LIB_NAME(void)
-        {
-        if(CCA4758_LIB_NAME)
-                OPENSSL_free((void*)CCA4758_LIB_NAME);
-        CCA4758_LIB_NAME = NULL;
-        }
-static long set_CCA4758_LIB_NAME(const char *name)
-        {
-        free_CCA4758_LIB_NAME();
-        return (((CCA4758_LIB_NAME = BUF_strdup(name)) != NULL) ? 1 : 0);
-        }
-#ifndef OPENSSL_NO_RSA
-static const char* n_keyRecordRead = CSNDKRR;
-static const char* n_digitalSignatureGenerate = CSNDDSG;
-static const char* n_digitalSignatureVerify = CSNDDSV;
-static const char* n_publicKeyExtract = CSNDPKX;
-static const char* n_pkaEncrypt = CSNDPKE;
-static const char* n_pkaDecrypt = CSNDPKD;
-#endif
-static const char* n_randomNumberGenerate = CSNBRNG;
-
-static int hndidx = -1;
-static DSO *dso = NULL;
-
-/* openssl engine initialization structures */
-/*------------------------------------------*/
-
-#define CCA4758_CMD_SO_PATH             ENGINE_CMD_BASE
-static const ENGINE_CMD_DEFN    cca4758_cmd_defns[] = {
-        {CCA4758_CMD_SO_PATH,
-                "SO_PATH",
-                "Specifies the path to the '4758cca' shared library",
-                ENGINE_CMD_FLAG_STRING},
-        {0, NULL, NULL, 0}
-        };
-
-#ifndef OPENSSL_NO_RSA
-static RSA_METHOD ibm_4758_cca_rsa =
-        {
-        "IBM 4758 CCA RSA method",
-        cca_rsa_pub_enc,
-        NULL,
-        NULL,
-        cca_rsa_priv_dec,
-        NULL, /*rsa_mod_exp,*/
-        NULL, /*mod_exp_mont,*/
-        NULL, /* init */
-        NULL, /* finish */
-        RSA_FLAG_SIGN_VER,        /* flags */
-        NULL, /* app_data */
-        cca_rsa_sign, /* rsa_sign */
-        cca_rsa_verify  /* rsa_verify */
-        };
-#endif
-
-static RAND_METHOD ibm_4758_cca_rand =
-        {
-        /* "IBM 4758 RAND method", */
-        NULL, /* seed */
-        cca_get_random_bytes, /* get random bytes from the card */
-        NULL, /* cleanup */
-        NULL, /* add */
-        cca_get_random_bytes, /* pseudo rand */
-        cca_random_status, /* status */
-        };
-
-static const char *engine_4758_cca_id = "4758cca";
-static const char *engine_4758_cca_name = "IBM 4758 CCA hardware engine support";
-
-/* engine implementation */
-/*-----------------------*/
-static int bind_helper(ENGINE *e)
-        {
-        if(!ENGINE_set_id(e, engine_4758_cca_id) ||
-                        !ENGINE_set_name(e, engine_4758_cca_name) ||
-#ifndef OPENSSL_NO_RSA
-                        !ENGINE_set_RSA(e, &ibm_4758_cca_rsa) ||
-#endif
-                        !ENGINE_set_RAND(e, &ibm_4758_cca_rand) ||
-                        !ENGINE_set_destroy_function(e, ibm_4758_cca_destroy) ||
-                        !ENGINE_set_init_function(e, ibm_4758_cca_init) ||
-                        !ENGINE_set_finish_function(e, ibm_4758_cca_finish) ||
-                        !ENGINE_set_ctrl_function(e, ibm_4758_cca_ctrl) ||
-                        !ENGINE_set_load_privkey_function(e, ibm_4758_load_privkey) ||
-                        !ENGINE_set_load_pubkey_function(e, ibm_4758_load_pubkey) ||
-                        !ENGINE_set_cmd_defns(e, cca4758_cmd_defns))
-                return 0;
-        /* Ensure the error handling is set up */
-        ERR_load_CCA4758_strings();
-        return 1;
-        }
-
-#ifndef ENGINE_DYNAMIC_SUPPORT
-static ENGINE *engine_4758_cca(void)
-        {
-        ENGINE *ret = ENGINE_new();
-        if(!ret)
-                return NULL;
-        if(!bind_helper(ret))
-                {
-                ENGINE_free(ret);
-                return NULL;
-                }
-        return ret;
-        }
-
-void ENGINE_load_4758cca(void)
-        {
-        ENGINE *e_4758 = engine_4758_cca();
-        if (!e_4758) return;
-        ENGINE_add(e_4758);
-        ENGINE_free(e_4758);
-        ERR_clear_error();   
-        }
-#endif
-
-static int ibm_4758_cca_destroy(ENGINE *e)
-        {
-        ERR_unload_CCA4758_strings();
-        free_CCA4758_LIB_NAME();
-        return 1;
-        }
-
-static int ibm_4758_cca_init(ENGINE *e)
-        {
-        if(dso)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_ALREADY_LOADED);
-                goto err;
-                }
-
-        dso = DSO_load(NULL, get_CCA4758_LIB_NAME(), NULL, 0);
-        if(!dso)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_DSO_FAILURE);
-                goto err;
-                }
-
-#ifndef OPENSSL_NO_RSA
-        if(!(keyRecordRead = (F_KEYRECORDREAD)
-                                DSO_bind_func(dso, n_keyRecordRead)) ||
-                        !(randomNumberGenerate = (F_RANDOMNUMBERGENERATE)
-                                DSO_bind_func(dso, n_randomNumberGenerate)) ||
-                        !(digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)
-                                DSO_bind_func(dso, n_digitalSignatureGenerate)) ||
-                        !(digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)
-                                DSO_bind_func(dso, n_digitalSignatureVerify)) ||
-                        !(publicKeyExtract = (F_PUBLICKEYEXTRACT)
-                                DSO_bind_func(dso, n_publicKeyExtract)) ||
-                        !(pkaEncrypt = (F_PKAENCRYPT)
-                                DSO_bind_func(dso, n_pkaEncrypt)) ||
-                        !(pkaDecrypt = (F_PKADECRYPT)
-                                DSO_bind_func(dso, n_pkaDecrypt)))
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_DSO_FAILURE);
-                goto err;
-                }
-#else
-        if(!(randomNumberGenerate = (F_RANDOMNUMBERGENERATE)
-                                DSO_bind_func(dso, n_randomNumberGenerate)))
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_DSO_FAILURE);
-                goto err;
-                }
-#endif
-
-        hndidx = RSA_get_ex_new_index(0, "IBM 4758 CCA RSA key handle",
-                NULL, NULL, cca_ex_free);
-
-        return 1;
-err:
-        if(dso)
-                DSO_free(dso);
-        dso = NULL;
-
-        keyRecordRead = (F_KEYRECORDREAD)0;
-        randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
-        digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
-        digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
-        publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
-        pkaEncrypt = (F_PKAENCRYPT)0;
-        pkaDecrypt = (F_PKADECRYPT)0;
-        return 0;
-        }
-
-static int ibm_4758_cca_finish(ENGINE *e)
-        {
-        free_CCA4758_LIB_NAME();
-        if(!dso)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_FINISH,
-                                CCA4758_R_NOT_LOADED);
-                return 0;
-                }
-        if(!DSO_free(dso))
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_FINISH,
-                                CCA4758_R_UNIT_FAILURE);
-                return 0;
-                }
-        dso = NULL;
-        keyRecordRead = (F_KEYRECORDREAD)0;
-        randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
-        digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
-        digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
-        publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
-        pkaEncrypt = (F_PKAENCRYPT)0;
-        pkaDecrypt = (F_PKADECRYPT)0;
-        return 1;
-        }
-
-static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-        {
-        int initialised = ((dso == NULL) ? 0 : 1);
-        switch(cmd)
-                {
-        case CCA4758_CMD_SO_PATH:
-                if(p == NULL)
-                        {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_CTRL,
-                                        ERR_R_PASSED_NULL_PARAMETER);
-                        return 0;
-                        }
-                if(initialised)
-                        {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_CTRL,
-                                        CCA4758_R_ALREADY_LOADED);
-                        return 0;
-                        }
-                return set_CCA4758_LIB_NAME((const char *)p);
-        default:
-                break;
-                }
-        CCA4758err(CCA4758_F_IBM_4758_CCA_CTRL,
-                        CCA4758_R_COMMAND_NOT_IMPLEMENTED);
-        return 0;
-        }
-
-#ifndef OPENSSL_NO_RSA
-
-#define MAX_CCA_PKA_TOKEN_SIZE 2500
-
-static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
-                        UI_METHOD *ui_method, void *callback_data)
-        {
-        RSA *rtmp = NULL;
-        EVP_PKEY *res = NULL;
-        unsigned char* keyToken = NULL;
-        unsigned char pubKeyToken[MAX_CCA_PKA_TOKEN_SIZE];
-        long pubKeyTokenLength = MAX_CCA_PKA_TOKEN_SIZE;
-        long keyTokenLength = MAX_CCA_PKA_TOKEN_SIZE;
-        long returnCode;
-        long reasonCode;
-        long exitDataLength = 0;
-        long ruleArrayLength = 0;
-        unsigned char exitData[8];
-        unsigned char ruleArray[8];
-        unsigned char keyLabel[64];
-        long keyLabelLength = strlen(key_id);
-        unsigned char modulus[256];
-        long modulusFieldLength = sizeof(modulus);
-        long modulusLength = 0;
-        unsigned char exponent[256];
-        long exponentLength = sizeof(exponent);
-
-        if (keyLabelLength > sizeof(keyLabel))
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                return NULL;
-                }
-
-        memset(keyLabel,' ', sizeof(keyLabel));
-        memcpy(keyLabel, key_id, keyLabelLength);
-
-        keyToken = OPENSSL_malloc(MAX_CCA_PKA_TOKEN_SIZE + sizeof(long));
-        if (!keyToken)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                                ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        keyRecordRead(&returnCode, &reasonCode, &exitDataLength,
-                exitData, &ruleArrayLength, ruleArray, keyLabel,
-                &keyTokenLength, keyToken+sizeof(long));
-
-        if (returnCode)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                        CCA4758_R_FAILED_LOADING_PRIVATE_KEY);
-                goto err;
-                }
-
-        publicKeyExtract(&returnCode, &reasonCode, &exitDataLength,
-                exitData, &ruleArrayLength, ruleArray, &keyTokenLength,
-                keyToken+sizeof(long), &pubKeyTokenLength, pubKeyToken);
-
-        if (returnCode)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                        CCA4758_R_FAILED_LOADING_PRIVATE_KEY);
-                goto err;
-                }
-
-        if (!getModulusAndExponent(pubKeyToken, &exponentLength,
-                        exponent, &modulusLength, &modulusFieldLength,
-                        modulus))
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                        CCA4758_R_FAILED_LOADING_PRIVATE_KEY);
-                goto err;
-                }
-
-        (*(long*)keyToken) = keyTokenLength;
-        rtmp = RSA_new_method(e);
-        RSA_set_ex_data(rtmp, hndidx, (char *)keyToken);
-
-        rtmp->e = BN_bin2bn(exponent, exponentLength, NULL);
-        rtmp->n = BN_bin2bn(modulus, modulusFieldLength, NULL);
-        rtmp->flags |= RSA_FLAG_EXT_PKEY;
-
-        res = EVP_PKEY_new();
-        EVP_PKEY_assign_RSA(res, rtmp);
-
-        return res;
-err:
-        if (keyToken)
-                OPENSSL_free(keyToken);
-        if (res)
-                EVP_PKEY_free(res);
-        if (rtmp)
-                RSA_free(rtmp);
-        return NULL;
-        }
-
-static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
-                        UI_METHOD *ui_method, void *callback_data)
-        {
-        RSA *rtmp = NULL;
-        EVP_PKEY *res = NULL;
-        unsigned char* keyToken = NULL;
-        long keyTokenLength = MAX_CCA_PKA_TOKEN_SIZE;
-        long returnCode;
-        long reasonCode;
-        long exitDataLength = 0;
-        long ruleArrayLength = 0;
-        unsigned char exitData[8];
-        unsigned char ruleArray[8];
-        unsigned char keyLabel[64];
-        long keyLabelLength = strlen(key_id);
-        unsigned char modulus[512];
-        long modulusFieldLength = sizeof(modulus);
-        long modulusLength = 0;
-        unsigned char exponent[512];
-        long exponentLength = sizeof(exponent);
-
-        if (keyLabelLength > sizeof(keyLabel))
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                        CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                return NULL;
-                }
-
-        memset(keyLabel,' ', sizeof(keyLabel));
-        memcpy(keyLabel, key_id, keyLabelLength);
-
-        keyToken = OPENSSL_malloc(MAX_CCA_PKA_TOKEN_SIZE + sizeof(long));
-        if (!keyToken)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PUBKEY,
-                                ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        keyRecordRead(&returnCode, &reasonCode, &exitDataLength, exitData,
-                &ruleArrayLength, ruleArray, keyLabel, &keyTokenLength,
-                keyToken+sizeof(long));
-
-        if (returnCode)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                                ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        if (!getModulusAndExponent(keyToken+sizeof(long), &exponentLength,
-                        exponent, &modulusLength, &modulusFieldLength, modulus))
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
-                        CCA4758_R_FAILED_LOADING_PUBLIC_KEY);
-                goto err;
-                }
-
-        (*(long*)keyToken) = keyTokenLength;
-        rtmp = RSA_new_method(e);
-        RSA_set_ex_data(rtmp, hndidx, (char *)keyToken);
-        rtmp->e = BN_bin2bn(exponent, exponentLength, NULL);
-        rtmp->n = BN_bin2bn(modulus, modulusFieldLength, NULL);
-        rtmp->flags |= RSA_FLAG_EXT_PKEY;
-        res = EVP_PKEY_new();
-        EVP_PKEY_assign_RSA(res, rtmp);
-
-        return res;
-err:
-        if (keyToken)
-                OPENSSL_free(keyToken);
-        if (res)
-                EVP_PKEY_free(res);
-        if (rtmp)
-                RSA_free(rtmp);
-        return NULL;
-        }
-
-static int cca_rsa_pub_enc(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa,int padding)
-        {
-        long returnCode;
-        long reasonCode;
-        long lflen = flen;
-        long exitDataLength = 0;
-        unsigned char exitData[8];
-        long ruleArrayLength = 1;
-        unsigned char ruleArray[8] = "PKCS-1.2";
-        long dataStructureLength = 0;
-        unsigned char dataStructure[8];
-        long outputLength = RSA_size(rsa);
-        long keyTokenLength;
-        unsigned char* keyToken = (unsigned char*)RSA_get_ex_data(rsa, hndidx);
-
-        keyTokenLength = *(long*)keyToken;
-        keyToken+=sizeof(long);
-
-        pkaEncrypt(&returnCode, &reasonCode, &exitDataLength, exitData,
-                &ruleArrayLength, ruleArray, &lflen, (unsigned char*)from,
-                &dataStructureLength, dataStructure, &keyTokenLength,
-                keyToken, &outputLength, to);
-
-        if (returnCode || reasonCode)
-                return -(returnCode << 16 | reasonCode);
-        return outputLength;
-        }
-
-static int cca_rsa_priv_dec(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa,int padding)
-        {
-        long returnCode;
-        long reasonCode;
-        long lflen = flen;
-        long exitDataLength = 0;
-        unsigned char exitData[8];
-        long ruleArrayLength = 1;
-        unsigned char ruleArray[8] = "PKCS-1.2";
-        long dataStructureLength = 0;
-        unsigned char dataStructure[8];
-        long outputLength = RSA_size(rsa);
-        long keyTokenLength;
-        unsigned char* keyToken = (unsigned char*)RSA_get_ex_data(rsa, hndidx);
-
-        keyTokenLength = *(long*)keyToken;
-        keyToken+=sizeof(long);
-
-        pkaDecrypt(&returnCode, &reasonCode, &exitDataLength, exitData,
-                &ruleArrayLength, ruleArray, &lflen, (unsigned char*)from,
-                &dataStructureLength, dataStructure, &keyTokenLength,
-                keyToken, &outputLength, to);
-
-        return (returnCode | reasonCode) ? 0 : 1;
-        }
-
-#define SSL_SIG_LEN 36
-
-static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
-                unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)
-        {
-        long returnCode;
-        long reasonCode;
-        long lsiglen = siglen;
-        long exitDataLength = 0;
-        unsigned char exitData[8];
-        long ruleArrayLength = 1;
-        unsigned char ruleArray[8] = "PKCS-1.1";
-        long keyTokenLength;
-        unsigned char* keyToken = (unsigned char*)RSA_get_ex_data(rsa, hndidx);
-        long length = SSL_SIG_LEN;
-        long keyLength ;
-        unsigned char *hashBuffer = NULL;
-        X509_SIG sig;
-        ASN1_TYPE parameter;
-        X509_ALGOR algorithm;
-        ASN1_OCTET_STRING digest;
-
-        keyTokenLength = *(long*)keyToken;
-        keyToken+=sizeof(long);
-
-        if (type == NID_md5 || type == NID_sha1)
-                {
-                sig.algor = &algorithm;
-                algorithm.algorithm = OBJ_nid2obj(type);
-
-                if (!algorithm.algorithm)
-                        {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                                CCA4758_R_UNKNOWN_ALGORITHM_TYPE);
-                        return 0;
-                        }
-
-                if (!algorithm.algorithm->length)
-                        {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                                CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD);
-                        return 0;
-                        }
-
-                parameter.type = V_ASN1_NULL;
-                parameter.value.ptr = NULL;
-                algorithm.parameter = &parameter;
-
-                sig.digest = &digest;
-                sig.digest->data = (unsigned char*)m;
-                sig.digest->length = m_len;
-
-                length = i2d_X509_SIG(&sig, NULL);
-                }
-
-        keyLength = RSA_size(rsa);
-
-        if (length - RSA_PKCS1_PADDING > keyLength)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                        CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                return 0;
-                }
-
-        switch (type)
-                {
-                case NID_md5_sha1 :
-                        if (m_len != SSL_SIG_LEN)
-                                {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                                CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                                return 0;
-                                }
-
-                        hashBuffer = (unsigned char *)m;
-                        length = m_len;
-                        break;
-                case NID_md5 :
-                        {
-                        unsigned char *ptr;
-                        ptr = hashBuffer = OPENSSL_malloc(
-                                        (unsigned int)keyLength+1);
-                        if (!hashBuffer)
-                                {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                                                ERR_R_MALLOC_FAILURE);
-                                return 0;
-                                }
-
-                        i2d_X509_SIG(&sig, &ptr);
-                        }
-                        break;
-                case NID_sha1 :
-                        {
-                        unsigned char *ptr;
-                        ptr = hashBuffer = OPENSSL_malloc(
-                                        (unsigned int)keyLength+1);
-                        if (!hashBuffer)
-                                {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                                                ERR_R_MALLOC_FAILURE);
-                                return 0;
-                                }
-                        i2d_X509_SIG(&sig, &ptr);
-                        }
-                        break;
-                default:
-                        return 0;
-                }
-
-        digitalSignatureVerify(&returnCode, &reasonCode, &exitDataLength,
-                exitData, &ruleArrayLength, ruleArray, &keyTokenLength,
-                keyToken, &length, hashBuffer, &lsiglen, sigbuf);
-
-        if (type == NID_sha1 || type == NID_md5)
-                {
-                OPENSSL_cleanse(hashBuffer, keyLength+1);
-                OPENSSL_free(hashBuffer);
-                }
-
-        return ((returnCode || reasonCode) ? 0 : 1);
-        }
-
-#define SSL_SIG_LEN 36
-
-static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
-                unsigned char *sigret, unsigned int *siglen, const RSA *rsa)
-        {
-        long returnCode;
-        long reasonCode;
-        long exitDataLength = 0;
-        unsigned char exitData[8];
-        long ruleArrayLength = 1;
-        unsigned char ruleArray[8] = "PKCS-1.1";
-        long outputLength=256;
-        long outputBitLength;
-        long keyTokenLength;
-        unsigned char *hashBuffer = NULL;
-        unsigned char* keyToken = (unsigned char*)RSA_get_ex_data(rsa, hndidx);
-        long length = SSL_SIG_LEN;
-        long keyLength ;
-        X509_SIG sig;
-        ASN1_TYPE parameter;
-        X509_ALGOR algorithm;
-        ASN1_OCTET_STRING digest;
-
-        keyTokenLength = *(long*)keyToken;
-        keyToken+=sizeof(long);
-
-        if (type == NID_md5 || type == NID_sha1)
-                {
-                sig.algor = &algorithm;
-                algorithm.algorithm = OBJ_nid2obj(type);
-
-                if (!algorithm.algorithm)
-                        {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
-                                CCA4758_R_UNKNOWN_ALGORITHM_TYPE);
-                        return 0;
-                        }
-
-                if (!algorithm.algorithm->length)
-                        {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
-                                CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD);
-                        return 0;
-                        }
-
-                parameter.type = V_ASN1_NULL;
-                parameter.value.ptr = NULL;
-                algorithm.parameter = &parameter;
-
-                sig.digest = &digest;
-                sig.digest->data = (unsigned char*)m;
-                sig.digest->length = m_len;
-
-                length = i2d_X509_SIG(&sig, NULL);
-                }
-
-        keyLength = RSA_size(rsa);
-
-        if (length - RSA_PKCS1_PADDING > keyLength)
-                {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
-                        CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                return 0;
-                }
-
-        switch (type)
-                {
-                case NID_md5_sha1 :
-                        if (m_len != SSL_SIG_LEN)
-                                {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
-                                CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                                return 0;
-                                }
-                        hashBuffer = (unsigned char*)m;
-                        length = m_len;
-                        break;
-                case NID_md5 :
-                        {
-                        unsigned char *ptr;
-                        ptr = hashBuffer = OPENSSL_malloc(
-                                        (unsigned int)keyLength+1);
-                        if (!hashBuffer)
-                                {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                                                ERR_R_MALLOC_FAILURE);
-                                return 0;
-                                }
-                        i2d_X509_SIG(&sig, &ptr);
-                        }
-                        break;
-                case NID_sha1 :
-                        {
-                        unsigned char *ptr;
-                        ptr = hashBuffer = OPENSSL_malloc(
-                                        (unsigned int)keyLength+1);
-                        if (!hashBuffer)
-                                {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
-                                                ERR_R_MALLOC_FAILURE);
-                                return 0;
-                                }
-                        i2d_X509_SIG(&sig, &ptr);
-                        }
-                        break;
-                default:
-                        return 0;
-                }
-
-        digitalSignatureGenerate(&returnCode, &reasonCode, &exitDataLength,
-                exitData, &ruleArrayLength, ruleArray, &keyTokenLength,
-                keyToken, &length, hashBuffer, &outputLength, &outputBitLength,
-                sigret);
-
-        if (type == NID_sha1 || type == NID_md5)
-                {
-                OPENSSL_cleanse(hashBuffer, keyLength+1);
-                OPENSSL_free(hashBuffer);
-                }
-
-        *siglen = outputLength;
-
-        return ((returnCode || reasonCode) ? 0 : 1);
-        }
-
-static int getModulusAndExponent(const unsigned char*token, long *exponentLength,
-                unsigned char *exponent, long *modulusLength, long *modulusFieldLength,
-                unsigned char *modulus)
-        {
-        unsigned long len;
-
-        if (*token++ != (char)0x1E) /* internal PKA token? */
-                return 0;
-
-        if (*token++) /* token version must be zero */
-                return 0;
-
-        len = *token++;
-        len = len << 8;
-        len |= (unsigned char)*token++;
-
-        token += 4; /* skip reserved bytes */
-
-        if (*token++ == (char)0x04)
-                {
-                if (*token++) /* token version must be zero */
-                        return 0;
-
-                len = *token++;
-                len = len << 8;
-                len |= (unsigned char)*token++;
-
-                token+=2; /* skip reserved section */
-
-                len = *token++;
-                len = len << 8;
-                len |= (unsigned char)*token++;
-
-                *exponentLength = len;
-
-                len = *token++;
-                len = len << 8;
-                len |= (unsigned char)*token++;
-
-                *modulusLength = len;
-
-                len = *token++;
-                len = len << 8;
-                len |= (unsigned char)*token++;
-
-                *modulusFieldLength = len;
-
-                memcpy(exponent, token, *exponentLength);
-                token+= *exponentLength;
-
-                memcpy(modulus, token, *modulusFieldLength);
-                return 1;
-                }
-        return 0;
-        }
-
-#endif /* OPENSSL_NO_RSA */
-
-static int cca_random_status(void)
-        {
-        return 1;
-        }
-
-static int cca_get_random_bytes(unsigned char* buf, int num)
-        {
-        long ret_code;
-        long reason_code;
-        long exit_data_length;
-        unsigned char exit_data[4];
-        unsigned char form[] = "RANDOM  ";
-        unsigned char rand_buf[8];
-
-        while(num >= sizeof(rand_buf))
-                {
-                randomNumberGenerate(&ret_code, &reason_code, &exit_data_length,
-                        exit_data, form, rand_buf);
-                if (ret_code)
-                        return 0;
-                num -= sizeof(rand_buf);
-                memcpy(buf, rand_buf, sizeof(rand_buf));
-                buf += sizeof(rand_buf);
-                }
-
-        if (num)
-                {
-                randomNumberGenerate(&ret_code, &reason_code, NULL, NULL,
-                        form, rand_buf);
-                if (ret_code)
-                        return 0;
-                memcpy(buf, rand_buf, num);
-                }
-
-        return 1;
-        }
-
-static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, int idx,
-                long argl, void *argp)
-        {
-        if (item)
-                OPENSSL_free(item);
-        }
-
-/* Goo to handle building as a dynamic engine */
-#ifdef ENGINE_DYNAMIC_SUPPORT 
-static int bind_fn(ENGINE *e, const char *id)
-        {
-        if(id && (strcmp(id, engine_4758_cca_id) != 0))
-                return 0;
-        if(!bind_helper(e))
-                return 0;
-        return 1;
-        }       
-IMPLEMENT_DYNAMIC_CHECK_FN()
-IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
-
-#endif /* !OPENSSL_NO_HW_4758_CCA */
-#endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/hw_aep.c b/src/lib/libcrypto/engine/hw_aep.c
deleted file mode 100644
index 5f1772ea99..0000000000
--- a/src/lib/libcrypto/engine/hw_aep.c
+++ /dev/null
@@ -1,1120 +0,0 @@
-/* crypto/engine/hw_aep.c */
-/*
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <openssl/bn.h>
-#include <string.h>
-
-#include <openssl/e_os2.h>
-#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
-#include <sys/types.h>
-#include <unistd.h>
-#else
-#include <process.h>
-typedef int pid_t;
-#endif
-
-#include <openssl/crypto.h>
-#include <openssl/dso.h>
-#include <openssl/engine.h>
-#include <openssl/buffer.h>
-
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_AEP
-#ifdef FLAT_INC
-#include "aep.h"
-#else
-#include "vendor_defns/aep.h"
-#endif
-
-#define AEP_LIB_NAME "aep engine"
-#define FAIL_TO_SW 0x10101010
-
-#include "hw_aep_err.c"
-
-static int aep_init(ENGINE *e);
-static int aep_finish(ENGINE *e);
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
-static int aep_destroy(ENGINE *e);
-
-static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR hConnection);
-static AEP_RV aep_return_connection(AEP_CONNECTION_HNDL hConnection);
-static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection);
-static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use);
-
-/* BIGNUM stuff */
-static int aep_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *m, BN_CTX *ctx);
-
-static AEP_RV aep_mod_exp_crt(BIGNUM *r,const  BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *q, const BIGNUM *dmp1,const BIGNUM *dmq1,
-        const BIGNUM *iqmp, BN_CTX *ctx);
-
-/* RSA stuff */
-#ifndef OPENSSL_NO_RSA
-static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-#endif
-
-/* This function is aliased to mod_exp (with the mont stuff dropped). */
-static int aep_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-
-/* DSA stuff */
-#ifndef OPENSSL_NO_DSA
-static int aep_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
-        BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
-        BN_CTX *ctx, BN_MONT_CTX *in_mont);
-
-static int aep_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
-        const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-        BN_MONT_CTX *m_ctx);
-#endif
-
-/* DH stuff */
-/* This function is aliased to mod_exp (with the DH and mont dropped). */
-#ifndef OPENSSL_NO_DH
-static int aep_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-        const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-#endif
-
-/* rand stuff   */
-#ifdef AEPRAND
-static int aep_rand(unsigned char *buf, int num);
-static int aep_rand_status(void);
-#endif
-
-/* Bignum conversion stuff */
-static AEP_RV GetBigNumSize(AEP_VOID_PTR ArbBigNum, AEP_U32* BigNumSize);
-static AEP_RV MakeAEPBigNum(AEP_VOID_PTR ArbBigNum, AEP_U32 BigNumSize,
-        unsigned char* AEP_BigNum);
-static AEP_RV ConvertAEPBigNum(void* ArbBigNum, AEP_U32 BigNumSize,
-        unsigned char* AEP_BigNum);
-
-/* The definitions for control commands specific to this engine */
-#define AEP_CMD_SO_PATH         ENGINE_CMD_BASE
-static const ENGINE_CMD_DEFN aep_cmd_defns[] =
-        {
-        { AEP_CMD_SO_PATH,
-          "SO_PATH",
-          "Specifies the path to the 'aep' shared library",
-          ENGINE_CMD_FLAG_STRING
-        },
-        {0, NULL, NULL, 0}
-        };
-
-#ifndef OPENSSL_NO_RSA
-/* Our internal RSA_METHOD that we provide pointers to */
-static RSA_METHOD aep_rsa =
-        {
-        "Aep RSA method",
-        NULL,                /*rsa_pub_encrypt*/
-        NULL,                /*rsa_pub_decrypt*/
-        NULL,                /*rsa_priv_encrypt*/
-        NULL,                /*rsa_priv_encrypt*/
-        aep_rsa_mod_exp,     /*rsa_mod_exp*/
-        aep_mod_exp_mont,    /*bn_mod_exp*/
-        NULL,                /*init*/
-        NULL,                /*finish*/
-        0,                   /*flags*/
-        NULL,                /*app_data*/
-        NULL,                /*rsa_sign*/
-        NULL                 /*rsa_verify*/
-        };
-#endif
-
-#ifndef OPENSSL_NO_DSA
-/* Our internal DSA_METHOD that we provide pointers to */
-static DSA_METHOD aep_dsa =
-        {
-        "Aep DSA method",
-        NULL,                /* dsa_do_sign */
-        NULL,                /* dsa_sign_setup */
-        NULL,                /* dsa_do_verify */
-        aep_dsa_mod_exp,     /* dsa_mod_exp */
-        aep_mod_exp_dsa,     /* bn_mod_exp */
-        NULL,                /* init */
-        NULL,                /* finish */
-        0,                   /* flags */
-        NULL                 /* app_data */
-        };
-#endif
-
-#ifndef OPENSSL_NO_DH
-/* Our internal DH_METHOD that we provide pointers to */
-static DH_METHOD aep_dh =
-        {
-        "Aep DH method",
-        NULL,
-        NULL,
-        aep_mod_exp_dh,
-        NULL,
-        NULL,
-        0,
-        NULL
-        };
-#endif
-
-#ifdef AEPRAND
-/* our internal RAND_method that we provide pointers to  */
-static RAND_METHOD aep_random =
-        {
-        /*"AEP RAND method", */
-        NULL,
-        aep_rand,
-        NULL,
-        NULL,
-        aep_rand,
-        aep_rand_status,
-        };
-#endif
-
-/*Define an array of structures to hold connections*/
-static AEP_CONNECTION_ENTRY aep_app_conn_table[MAX_PROCESS_CONNECTIONS];
-
-/*Used to determine if this is a new process*/
-static pid_t    recorded_pid = 0;
-
-#ifdef AEPRAND
-static AEP_U8   rand_block[RAND_BLK_SIZE];
-static AEP_U32  rand_block_bytes = 0;
-#endif
-
-/* Constants used when creating the ENGINE */
-static const char *engine_aep_id = "aep";
-static const char *engine_aep_name = "Aep hardware engine support";
-
-static int max_key_len = 2176;
-
-
-/* This internal function is used by ENGINE_aep() and possibly by the
- * "dynamic" ENGINE support too */
-static int bind_aep(ENGINE *e)
-        {
-#ifndef OPENSSL_NO_RSA
-        const RSA_METHOD  *meth1;
-#endif
-#ifndef OPENSSL_NO_DSA
-        const DSA_METHOD  *meth2;
-#endif
-#ifndef OPENSSL_NO_DH
-        const DH_METHOD   *meth3;
-#endif
-
-        if(!ENGINE_set_id(e, engine_aep_id) ||
-                !ENGINE_set_name(e, engine_aep_name) ||
-#ifndef OPENSSL_NO_RSA
-                !ENGINE_set_RSA(e, &aep_rsa) ||
-#endif
-#ifndef OPENSSL_NO_DSA
-                !ENGINE_set_DSA(e, &aep_dsa) ||
-#endif
-#ifndef OPENSSL_NO_DH
-                !ENGINE_set_DH(e, &aep_dh) ||
-#endif
-#ifdef AEPRAND
-                !ENGINE_set_RAND(e, &aep_random) ||
-#endif
-                !ENGINE_set_init_function(e, aep_init) ||
-                !ENGINE_set_destroy_function(e, aep_destroy) ||
-                !ENGINE_set_finish_function(e, aep_finish) ||
-                !ENGINE_set_ctrl_function(e, aep_ctrl) ||
-                !ENGINE_set_cmd_defns(e, aep_cmd_defns))
-                return 0;
-
-#ifndef OPENSSL_NO_RSA
-        /* We know that the "PKCS1_SSLeay()" functions hook properly
-         * to the aep-specific mod_exp and mod_exp_crt so we use
-         * those functions. NB: We don't use ENGINE_openssl() or
-         * anything "more generic" because something like the RSAref
-         * code may not hook properly, and if you own one of these
-         * cards then you have the right to do RSA operations on it
-         * anyway! */
-        meth1 = RSA_PKCS1_SSLeay();
-        aep_rsa.rsa_pub_enc = meth1->rsa_pub_enc;
-        aep_rsa.rsa_pub_dec = meth1->rsa_pub_dec;
-        aep_rsa.rsa_priv_enc = meth1->rsa_priv_enc;
-        aep_rsa.rsa_priv_dec = meth1->rsa_priv_dec;
-#endif
-
-
-#ifndef OPENSSL_NO_DSA
-        /* Use the DSA_OpenSSL() method and just hook the mod_exp-ish
-         * bits. */
-        meth2 = DSA_OpenSSL();
-        aep_dsa.dsa_do_sign    = meth2->dsa_do_sign;
-        aep_dsa.dsa_sign_setup = meth2->dsa_sign_setup;
-        aep_dsa.dsa_do_verify  = meth2->dsa_do_verify;
-
-        aep_dsa = *DSA_get_default_method(); 
-        aep_dsa.dsa_mod_exp = aep_dsa_mod_exp; 
-        aep_dsa.bn_mod_exp = aep_mod_exp_dsa;
-#endif
-
-#ifndef OPENSSL_NO_DH
-        /* Much the same for Diffie-Hellman */
-        meth3 = DH_OpenSSL();
-        aep_dh.generate_key = meth3->generate_key;
-        aep_dh.compute_key  = meth3->compute_key;
-        aep_dh.bn_mod_exp   = meth3->bn_mod_exp;
-#endif
-
-        /* Ensure the aep error handling is set up */
-        ERR_load_AEPHK_strings();
-
-        return 1;
-}
-
-#ifdef ENGINE_DYNAMIC_SUPPORT
-static int bind_helper(ENGINE *e, const char *id)
-        {
-        if(id && (strcmp(id, engine_aep_id) != 0))
-                return 0;
-        if(!bind_aep(e))
-                return 0;
-        return 1;
-        }       
-IMPLEMENT_DYNAMIC_CHECK_FN()
-IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
-#else
-static ENGINE *engine_aep(void)
-        {
-        ENGINE *ret = ENGINE_new();
-        if(!ret)
-                return NULL;
-        if(!bind_aep(ret))
-                {
-                ENGINE_free(ret);
-                return NULL;
-                }
-        return ret;
-        }
-
-void ENGINE_load_aep(void)
-        {
-        /* Copied from eng_[openssl|dyn].c */
-        ENGINE *toadd = engine_aep();
-        if(!toadd) return;
-        ENGINE_add(toadd);
-        ENGINE_free(toadd);
-        ERR_clear_error();
-        }
-#endif
-
-/* This is a process-global DSO handle used for loading and unloading
- * the Aep library. NB: This is only set (or unset) during an
- * init() or finish() call (reference counts permitting) and they're
- * operating with global locks, so this should be thread-safe
- * implicitly. */
-static DSO *aep_dso = NULL;
-
-/* These are the static string constants for the DSO file name and the function
- * symbol names to bind to. 
-*/
-static const char *AEP_LIBNAME = NULL;
-static const char *get_AEP_LIBNAME(void)
-        {
-        if(AEP_LIBNAME)
-                return AEP_LIBNAME;
-        return "aep";
-        }
-static void free_AEP_LIBNAME(void)
-        {
-        if(AEP_LIBNAME)
-                OPENSSL_free((void*)AEP_LIBNAME);
-        AEP_LIBNAME = NULL;
-        }
-static long set_AEP_LIBNAME(const char *name)
-        {
-        free_AEP_LIBNAME();
-        return ((AEP_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0);
-        }
-
-static const char *AEP_F1    = "AEP_ModExp";
-static const char *AEP_F2    = "AEP_ModExpCrt";
-#ifdef AEPRAND
-static const char *AEP_F3    = "AEP_GenRandom";
-#endif
-static const char *AEP_F4    = "AEP_Finalize";
-static const char *AEP_F5    = "AEP_Initialize";
-static const char *AEP_F6    = "AEP_OpenConnection";
-static const char *AEP_F7    = "AEP_SetBNCallBacks";
-static const char *AEP_F8    = "AEP_CloseConnection";
-
-/* These are the function pointers that are (un)set when the library has
- * successfully (un)loaded. */
-static t_AEP_OpenConnection    *p_AEP_OpenConnection  = NULL;
-static t_AEP_CloseConnection   *p_AEP_CloseConnection = NULL;
-static t_AEP_ModExp            *p_AEP_ModExp          = NULL;
-static t_AEP_ModExpCrt         *p_AEP_ModExpCrt       = NULL;
-#ifdef AEPRAND
-static t_AEP_GenRandom         *p_AEP_GenRandom       = NULL;
-#endif
-static t_AEP_Initialize        *p_AEP_Initialize      = NULL;
-static t_AEP_Finalize          *p_AEP_Finalize        = NULL;
-static t_AEP_SetBNCallBacks    *p_AEP_SetBNCallBacks  = NULL;
-
-/* (de)initialisation functions. */
-static int aep_init(ENGINE *e)
-        {
-        t_AEP_ModExp          *p1;
-        t_AEP_ModExpCrt       *p2;
-#ifdef AEPRAND
-        t_AEP_GenRandom       *p3;
-#endif
-        t_AEP_Finalize        *p4;
-        t_AEP_Initialize      *p5;
-        t_AEP_OpenConnection  *p6;
-        t_AEP_SetBNCallBacks  *p7;
-        t_AEP_CloseConnection *p8;
-
-        int to_return = 0;
- 
-        if(aep_dso != NULL)
-                {
-                AEPHKerr(AEPHK_F_AEP_INIT,AEPHK_R_ALREADY_LOADED);
-                goto err;
-                }
-        /* Attempt to load libaep.so. */
-
-        aep_dso = DSO_load(NULL, get_AEP_LIBNAME(), NULL, 0);
-  
-        if(aep_dso == NULL)
-                {
-                AEPHKerr(AEPHK_F_AEP_INIT,AEPHK_R_NOT_LOADED);
-                goto err;
-                }
-
-        if(     !(p1 = (t_AEP_ModExp *)     DSO_bind_func( aep_dso,AEP_F1))  ||
-                !(p2 = (t_AEP_ModExpCrt*)   DSO_bind_func( aep_dso,AEP_F2))  ||
-#ifdef AEPRAND
-                !(p3 = (t_AEP_GenRandom*)   DSO_bind_func( aep_dso,AEP_F3))  ||
-#endif
-                !(p4 = (t_AEP_Finalize*)    DSO_bind_func( aep_dso,AEP_F4))  ||
-                !(p5 = (t_AEP_Initialize*)  DSO_bind_func( aep_dso,AEP_F5))  ||
-                !(p6 = (t_AEP_OpenConnection*) DSO_bind_func( aep_dso,AEP_F6))  ||
-                !(p7 = (t_AEP_SetBNCallBacks*) DSO_bind_func( aep_dso,AEP_F7))  ||
-                !(p8 = (t_AEP_CloseConnection*) DSO_bind_func( aep_dso,AEP_F8)))
-                {
-                AEPHKerr(AEPHK_F_AEP_INIT,AEPHK_R_NOT_LOADED);
-                goto err;
-                }
-
-        /* Copy the pointers */
-  
-        p_AEP_ModExp           = p1;
-        p_AEP_ModExpCrt        = p2;
-#ifdef AEPRAND
-        p_AEP_GenRandom        = p3;
-#endif
-        p_AEP_Finalize         = p4;
-        p_AEP_Initialize       = p5;
-        p_AEP_OpenConnection   = p6;
-        p_AEP_SetBNCallBacks   = p7;
-        p_AEP_CloseConnection  = p8;
- 
-        to_return = 1;
- 
-        return to_return;
-
- err: 
-
-        if(aep_dso)
-                DSO_free(aep_dso);
-        aep_dso = NULL;
-                
-        p_AEP_OpenConnection    = NULL;
-        p_AEP_ModExp            = NULL;
-        p_AEP_ModExpCrt         = NULL;
-#ifdef AEPRAND
-        p_AEP_GenRandom         = NULL;
-#endif
-        p_AEP_Initialize        = NULL;
-        p_AEP_Finalize          = NULL;
-        p_AEP_SetBNCallBacks    = NULL;
-        p_AEP_CloseConnection   = NULL;
-
-        return to_return;
-        }
-
-/* Destructor (complements the "ENGINE_aep()" constructor) */
-static int aep_destroy(ENGINE *e)
-        {
-        free_AEP_LIBNAME();
-        ERR_unload_AEPHK_strings();
-        return 1;
-        }
-
-static int aep_finish(ENGINE *e)
-        {
-        int to_return = 0, in_use;
-        AEP_RV rv;
-
-        if(aep_dso == NULL)
-                {
-                AEPHKerr(AEPHK_F_AEP_FINISH,AEPHK_R_NOT_LOADED);
-                goto err;
-                }
-
-        rv = aep_close_all_connections(0, &in_use);
-        if (rv != AEP_R_OK)
-                {
-                AEPHKerr(AEPHK_F_AEP_FINISH,AEPHK_R_CLOSE_HANDLES_FAILED);
-                goto err;
-                }
-        if (in_use)
-                {
-                AEPHKerr(AEPHK_F_AEP_FINISH,AEPHK_R_CONNECTIONS_IN_USE);
-                goto err;
-                }
-
-        rv = p_AEP_Finalize();
-        if (rv != AEP_R_OK)
-                {
-                AEPHKerr(AEPHK_F_AEP_FINISH,AEPHK_R_FINALIZE_FAILED);
-                goto err;
-                }
-
-        if(!DSO_free(aep_dso))
-                {
-                AEPHKerr(AEPHK_F_AEP_FINISH,AEPHK_R_UNIT_FAILURE);
-                goto err;
-                }
-
-        aep_dso = NULL;
-        p_AEP_CloseConnection   = NULL;
-        p_AEP_OpenConnection    = NULL;
-        p_AEP_ModExp            = NULL;
-        p_AEP_ModExpCrt         = NULL;
-#ifdef AEPRAND
-        p_AEP_GenRandom         = NULL;
-#endif
-        p_AEP_Initialize        = NULL;
-        p_AEP_Finalize          = NULL;
-        p_AEP_SetBNCallBacks    = NULL;
-
-        to_return = 1;
- err:
-        return to_return;
-        }
-
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-        {
-        int initialised = ((aep_dso == NULL) ? 0 : 1);
-        switch(cmd)
-                {
-        case AEP_CMD_SO_PATH:
-                if(p == NULL)
-                        {
-                        AEPHKerr(AEPHK_F_AEP_CTRL,
-                                ERR_R_PASSED_NULL_PARAMETER);
-                        return 0;
-                        }
-                if(initialised)
-                        {
-                        AEPHKerr(AEPHK_F_AEP_CTRL,
-                                AEPHK_R_ALREADY_LOADED);
-                        return 0;
-                        }
-                return set_AEP_LIBNAME((const char*)p);
-        default:
-                break;
-                }
-        AEPHKerr(AEPHK_F_AEP_CTRL,AEPHK_R_CTRL_COMMAND_NOT_IMPLEMENTED);
-        return 0;
-        }
-
-static int aep_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *m, BN_CTX *ctx)
-        {
-        int to_return = 0;
-        int     r_len = 0;
-        AEP_CONNECTION_HNDL hConnection;
-        AEP_RV rv;
-        
-        r_len = BN_num_bits(m);
-
-        /* Perform in software if modulus is too large for hardware. */
-
-        if (r_len > max_key_len){
-                AEPHKerr(AEPHK_F_AEP_MOD_EXP, AEPHK_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                return BN_mod_exp(r, a, p, m, ctx);
-        } 
-
-        /*Grab a connection from the pool*/
-        rv = aep_get_connection(&hConnection);
-        if (rv != AEP_R_OK)
-                {     
-                AEPHKerr(AEPHK_F_AEP_MOD_EXP,AEPHK_R_GET_HANDLE_FAILED);
-                return BN_mod_exp(r, a, p, m, ctx);
-                }
-
-        /*To the card with the mod exp*/
-        rv = p_AEP_ModExp(hConnection,(void*)a, (void*)p,(void*)m, (void*)r,NULL);
-
-        if (rv !=  AEP_R_OK)
-                {
-                AEPHKerr(AEPHK_F_AEP_MOD_EXP,AEPHK_R_MOD_EXP_FAILED);
-                rv = aep_close_connection(hConnection);
-                return BN_mod_exp(r, a, p, m, ctx);
-                }
-
-        /*Return the connection to the pool*/
-        rv = aep_return_connection(hConnection);
-        if (rv != AEP_R_OK)
-                {
-                AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_RETURN_CONNECTION_FAILED); 
-                goto err;
-                }
-
-        to_return = 1;
- err:
-        return to_return;
-        }
-        
-static AEP_RV aep_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *q, const BIGNUM *dmp1,
-        const BIGNUM *dmq1,const BIGNUM *iqmp, BN_CTX *ctx)
-        {
-        AEP_RV rv = AEP_R_OK;
-        AEP_CONNECTION_HNDL hConnection;
-
-        /*Grab a connection from the pool*/
-        rv = aep_get_connection(&hConnection);
-        if (rv != AEP_R_OK)
-                {
-                AEPHKerr(AEPHK_F_AEP_MOD_EXP_CRT,AEPHK_R_GET_HANDLE_FAILED);
-                return FAIL_TO_SW;
-                }
-
-        /*To the card with the mod exp*/
-        rv = p_AEP_ModExpCrt(hConnection,(void*)a, (void*)p, (void*)q, (void*)dmp1,(void*)dmq1,
-                (void*)iqmp,(void*)r,NULL);
-        if (rv != AEP_R_OK)
-                {
-                AEPHKerr(AEPHK_F_AEP_MOD_EXP_CRT,AEPHK_R_MOD_EXP_CRT_FAILED);
-                rv = aep_close_connection(hConnection);
-                return FAIL_TO_SW;
-                }
-
-        /*Return the connection to the pool*/
-        rv = aep_return_connection(hConnection);
-        if (rv != AEP_R_OK)
-                {
-                AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_RETURN_CONNECTION_FAILED); 
-                goto err;
-                }
- 
- err:
-        return rv;
-        }
-        
-
-#ifdef AEPRAND
-static int aep_rand(unsigned char *buf,int len )
-        {
-        AEP_RV rv = AEP_R_OK;
-        AEP_CONNECTION_HNDL hConnection;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_RAND);
-
-        /*Can the request be serviced with what's already in the buffer?*/
-        if (len <= rand_block_bytes)
-                {
-                memcpy(buf, &rand_block[RAND_BLK_SIZE - rand_block_bytes], len);
-                rand_block_bytes -= len;
-                CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-                }
-        else
-                /*If not the get another block of random bytes*/
-                {
-                CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-
-                rv = aep_get_connection(&hConnection);
-                if (rv !=  AEP_R_OK)
-                        { 
-                        AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_GET_HANDLE_FAILED);             
-                        goto err_nounlock;
-                        }
-
-                if (len > RAND_BLK_SIZE)
-                        {
-                        rv = p_AEP_GenRandom(hConnection, len, 2, buf, NULL);
-                        if (rv !=  AEP_R_OK)
-                                {  
-                                AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_GET_RANDOM_FAILED); 
-                                goto err_nounlock;
-                                }
-                        }
-                else
-                        {
-                        CRYPTO_w_lock(CRYPTO_LOCK_RAND);
-
-                        rv = p_AEP_GenRandom(hConnection, RAND_BLK_SIZE, 2, &rand_block[0], NULL);
-                        if (rv !=  AEP_R_OK)
-                                {       
-                                AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_GET_RANDOM_FAILED); 
-              
-                                goto err;
-                                }
-
-                        rand_block_bytes = RAND_BLK_SIZE;
-
-                        memcpy(buf, &rand_block[RAND_BLK_SIZE - rand_block_bytes], len);
-                        rand_block_bytes -= len;
-
-                        CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-                        }
-
-                rv = aep_return_connection(hConnection);
-                if (rv != AEP_R_OK)
-                        {
-                        AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_RETURN_CONNECTION_FAILED); 
-          
-                        goto err_nounlock;
-                        }
-                }
-  
-        return 1;
- err:
-        CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
- err_nounlock:
-        return 0;
-        }
-        
-static int aep_rand_status(void)
-{
-        return 1;
-}
-#endif
-
-#ifndef OPENSSL_NO_RSA
-static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-        {
-        BN_CTX *ctx = NULL;
-        int to_return = 0;
-        AEP_RV rv = AEP_R_OK;
-
-        if ((ctx = BN_CTX_new()) == NULL)
-                goto err;
-
-        if (!aep_dso)
-                {
-                AEPHKerr(AEPHK_F_AEP_RSA_MOD_EXP,AEPHK_R_NOT_LOADED);
-                goto err;
-                }
-
-        /*See if we have all the necessary bits for a crt*/
-        if (rsa->q && rsa->dmp1 && rsa->dmq1 && rsa->iqmp)
-                {
-                rv =  aep_mod_exp_crt(r0,I,rsa->p,rsa->q, rsa->dmp1,rsa->dmq1,rsa->iqmp,ctx);
-
-                if (rv == FAIL_TO_SW){
-                        const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-                        to_return = (*meth->rsa_mod_exp)(r0, I, rsa);
-                        goto err;
-                }
-                else if (rv != AEP_R_OK)
-                        goto err;
-                }
-        else
-                {
-                if (!rsa->d || !rsa->n)
-                        {
-                        AEPHKerr(AEPHK_F_AEP_RSA_MOD_EXP,AEPHK_R_MISSING_KEY_COMPONENTS);
-                        goto err;
-                        }
- 
-                rv = aep_mod_exp(r0,I,rsa->d,rsa->n,ctx);
-                if  (rv != AEP_R_OK)
-                        goto err;
-        
-                }
-
-        to_return = 1;
-
- err:
-        if(ctx)
-                BN_CTX_free(ctx);
-        return to_return;
-}
-#endif
-
-#ifndef OPENSSL_NO_DSA
-static int aep_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
-        BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
-        BN_CTX *ctx, BN_MONT_CTX *in_mont)
-        {
-        BIGNUM t;
-        int to_return = 0;
-        BN_init(&t);
-
-        /* let rr = a1 ^ p1 mod m */
-        if (!aep_mod_exp(rr,a1,p1,m,ctx)) goto end;
-        /* let t = a2 ^ p2 mod m */
-        if (!aep_mod_exp(&t,a2,p2,m,ctx)) goto end;
-        /* let rr = rr * t mod m */
-        if (!BN_mod_mul(rr,rr,&t,m,ctx)) goto end;
-        to_return = 1;
- end: 
-        BN_free(&t);
-        return to_return;
-        }
-
-static int aep_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
-        const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-        BN_MONT_CTX *m_ctx)
-        {  
-        return aep_mod_exp(r, a, p, m, ctx); 
-        }
-#endif
-
-/* This function is aliased to mod_exp (with the mont stuff dropped). */
-static int aep_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-        {
-        return aep_mod_exp(r, a, p, m, ctx);
-        }
-
-#ifndef OPENSSL_NO_DH
-/* This function is aliased to mod_exp (with the dh and mont dropped). */
-static int aep_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-        const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-        BN_MONT_CTX *m_ctx)
-        {
-        return aep_mod_exp(r, a, p, m, ctx);
-        }
-#endif
-
-static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR phConnection)
-        {
-        int count;
-        AEP_RV rv = AEP_R_OK;
-
-        /*Get the current process id*/
-        pid_t curr_pid;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-
-        curr_pid = getpid();
-
-        /*Check if this is the first time this is being called from the current
-          process*/
-        if (recorded_pid != curr_pid)
-                {
-                /*Remember our pid so we can check if we're in a new process*/
-                recorded_pid = curr_pid;
-
-                /*Call Finalize to make sure we have not inherited some data
-                  from a parent process*/
-                p_AEP_Finalize();
-     
-                /*Initialise the AEP API*/
-                rv = p_AEP_Initialize(NULL);
-
-                if (rv != AEP_R_OK)
-                        {
-                        AEPHKerr(AEPHK_F_AEP_GET_CONNECTION,AEPHK_R_INIT_FAILURE);
-                        recorded_pid = 0;
-                        goto end;
-                        }
-
-                /*Set the AEP big num call back functions*/
-                rv = p_AEP_SetBNCallBacks(&GetBigNumSize, &MakeAEPBigNum,
-                        &ConvertAEPBigNum);
-
-                if (rv != AEP_R_OK)
-                        {
-                        AEPHKerr(AEPHK_F_AEP_GET_CONNECTION,AEPHK_R_SETBNCALLBACK_FAILURE);
-                        recorded_pid = 0;
-                        goto end;
-                        }
-
-#ifdef AEPRAND
-                /*Reset the rand byte count*/
-                rand_block_bytes = 0;
-#endif
-
-                /*Init the structures*/
-                for (count = 0;count < MAX_PROCESS_CONNECTIONS;count ++)
-                        {
-                        aep_app_conn_table[count].conn_state = NotConnected;
-                        aep_app_conn_table[count].conn_hndl  = 0;
-                        }
-
-                /*Open a connection*/
-                rv = p_AEP_OpenConnection(phConnection);
-
-                if (rv != AEP_R_OK)
-                        {
-                        AEPHKerr(AEPHK_F_AEP_GET_CONNECTION,AEPHK_R_UNIT_FAILURE);
-                        recorded_pid = 0;
-                        goto end;
-                        }
-
-                aep_app_conn_table[0].conn_state = InUse;
-                aep_app_conn_table[0].conn_hndl = *phConnection;
-                goto end;
-                }
-        /*Check the existing connections to see if we can find a free one*/
-        for (count = 0;count < MAX_PROCESS_CONNECTIONS;count ++)
-                {
-                if (aep_app_conn_table[count].conn_state == Connected)
-                        {
-                        aep_app_conn_table[count].conn_state = InUse;
-                        *phConnection = aep_app_conn_table[count].conn_hndl;
-                        goto end;
-                        }
-                }
-        /*If no connections available, we're going to have to try
-          to open a new one*/
-        for (count = 0;count < MAX_PROCESS_CONNECTIONS;count ++)
-                {
-                if (aep_app_conn_table[count].conn_state == NotConnected)
-                        {
-                        /*Open a connection*/
-                        rv = p_AEP_OpenConnection(phConnection);
-
-                        if (rv != AEP_R_OK)
-                                {             
-                                AEPHKerr(AEPHK_F_AEP_GET_CONNECTION,AEPHK_R_UNIT_FAILURE);
-                                goto end;
-                                }
-
-                        aep_app_conn_table[count].conn_state = InUse;
-                        aep_app_conn_table[count].conn_hndl = *phConnection;
-                        goto end;
-                        }
-                }
-        rv = AEP_R_GENERAL_ERROR;
- end:
-        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-        return rv;
-        }
-
-
-static AEP_RV aep_return_connection(AEP_CONNECTION_HNDL hConnection)
-        {
-        int count;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-
-        /*Find the connection item that matches this connection handle*/
-        for(count = 0;count < MAX_PROCESS_CONNECTIONS;count ++)
-                {
-                if (aep_app_conn_table[count].conn_hndl == hConnection)
-                        {
-                        aep_app_conn_table[count].conn_state = Connected;
-                        break;
-                        }
-                }
-
-        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-
-        return AEP_R_OK;
-        }
-
-static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection)
-        {
-        int count;
-        AEP_RV rv = AEP_R_OK;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-
-        /*Find the connection item that matches this connection handle*/
-        for(count = 0;count < MAX_PROCESS_CONNECTIONS;count ++)
-                {
-                if (aep_app_conn_table[count].conn_hndl == hConnection)
-                        {
-                        rv = p_AEP_CloseConnection(aep_app_conn_table[count].conn_hndl);
-                        if (rv != AEP_R_OK)
-                                goto end;
-                        aep_app_conn_table[count].conn_state = NotConnected;
-                        aep_app_conn_table[count].conn_hndl  = 0;
-                        break;
-                        }
-                }
-
- end:
-        CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-        return rv;
-        }
-
-static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use)
-        {
-        int count;
-        AEP_RV rv = AEP_R_OK;
-
-        *in_use = 0;
-        if (use_engine_lock) CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-        for (count = 0;count < MAX_PROCESS_CONNECTIONS;count ++)
-                {
-                switch (aep_app_conn_table[count].conn_state)
-                        {
-                case Connected:
-                        rv = p_AEP_CloseConnection(aep_app_conn_table[count].conn_hndl);
-                        if (rv != AEP_R_OK)
-                                goto end;
-                        aep_app_conn_table[count].conn_state = NotConnected;
-                        aep_app_conn_table[count].conn_hndl  = 0;
-                        break;
-                case InUse:
-                        (*in_use)++;
-                        break;
-                case NotConnected:
-                        break;
-                        }
-                }
- end:
-        if (use_engine_lock) CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-        return rv;
-        }
-
-/*BigNum call back functions, used to convert OpenSSL bignums into AEP bignums.
-  Note only 32bit Openssl build support*/
-
-static AEP_RV GetBigNumSize(AEP_VOID_PTR ArbBigNum, AEP_U32* BigNumSize)
-        {
-        BIGNUM* bn;
-
-        /*Cast the ArbBigNum pointer to our BIGNUM struct*/
-        bn = (BIGNUM*) ArbBigNum;
-
-#ifdef SIXTY_FOUR_BIT_LONG
-        *BigNumSize = bn->top << 3;
-#else
-        /*Size of the bignum in bytes is equal to the bn->top (no of 32 bit
-          words) multiplies by 4*/
-        *BigNumSize = bn->top << 2;
-#endif
-
-        return AEP_R_OK;
-        }
-
-static AEP_RV MakeAEPBigNum(AEP_VOID_PTR ArbBigNum, AEP_U32 BigNumSize,
-        unsigned char* AEP_BigNum)
-        {
-        BIGNUM* bn;
-
-#ifndef SIXTY_FOUR_BIT_LONG
-        unsigned char* buf;
-        int i;
-#endif
-
-        /*Cast the ArbBigNum pointer to our BIGNUM struct*/
-        bn = (BIGNUM*) ArbBigNum;
-
-#ifdef SIXTY_FOUR_BIT_LONG
-        memcpy(AEP_BigNum, bn->d, BigNumSize);
-#else
-        /*Must copy data into a (monotone) least significant byte first format
-          performing endian conversion if necessary*/
-        for(i=0;i<bn->top;i++)
-                {
-                buf = (unsigned char*)&bn->d[i];
-
-                *((AEP_U32*)AEP_BigNum) = (AEP_U32)
-                        ((unsigned) buf[1] << 8 | buf[0]) |
-                        ((unsigned) buf[3] << 8 | buf[2])  << 16;
-
-                AEP_BigNum += 4;
-                }
-#endif
-
-        return AEP_R_OK;
-        }
-
-/*Turn an AEP Big Num back to a user big num*/
-static AEP_RV ConvertAEPBigNum(void* ArbBigNum, AEP_U32 BigNumSize,
-        unsigned char* AEP_BigNum)
-        {
-        BIGNUM* bn;
-#ifndef SIXTY_FOUR_BIT_LONG
-        int i;
-#endif
-
-        bn = (BIGNUM*)ArbBigNum;
-
-        /*Expand the result bn so that it can hold our big num.
-          Size is in bits*/
-        bn_expand(bn, (int)(BigNumSize << 3));
-
-#ifdef SIXTY_FOUR_BIT_LONG
-        bn->top = BigNumSize >> 3;
-        
-        if((BigNumSize & 7) != 0)
-                bn->top++;
-
-        memset(bn->d, 0, bn->top << 3); 
-
-        memcpy(bn->d, AEP_BigNum, BigNumSize);
-#else
-        bn->top = BigNumSize >> 2;
- 
-        for(i=0;i<bn->top;i++)
-                {
-                bn->d[i] = (AEP_U32)
-                        ((unsigned) AEP_BigNum[3] << 8 | AEP_BigNum[2]) << 16 |
-                        ((unsigned) AEP_BigNum[1] << 8 | AEP_BigNum[0]);
-                AEP_BigNum += 4;
-                }
-#endif
-
-        return AEP_R_OK;
-}       
-        
-#endif /* !OPENSSL_NO_HW_AEP */
-#endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/hw_aep_err.c b/src/lib/libcrypto/engine/hw_aep_err.c
deleted file mode 100644
index 092f532946..0000000000
--- a/src/lib/libcrypto/engine/hw_aep_err.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* hw_aep_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include "hw_aep_err.h"
-
-/* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
-static ERR_STRING_DATA AEPHK_str_functs[]=
-        {
-{ERR_PACK(0,AEPHK_F_AEP_CTRL,0),        "AEP_CTRL"},
-{ERR_PACK(0,AEPHK_F_AEP_FINISH,0),      "AEP_FINISH"},
-{ERR_PACK(0,AEPHK_F_AEP_GET_CONNECTION,0),      "AEP_GET_CONNECTION"},
-{ERR_PACK(0,AEPHK_F_AEP_INIT,0),        "AEP_INIT"},
-{ERR_PACK(0,AEPHK_F_AEP_MOD_EXP,0),     "AEP_MOD_EXP"},
-{ERR_PACK(0,AEPHK_F_AEP_MOD_EXP_CRT,0), "AEP_MOD_EXP_CRT"},
-{ERR_PACK(0,AEPHK_F_AEP_RAND,0),        "AEP_RAND"},
-{ERR_PACK(0,AEPHK_F_AEP_RSA_MOD_EXP,0), "AEP_RSA_MOD_EXP"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA AEPHK_str_reasons[]=
-        {
-{AEPHK_R_ALREADY_LOADED                  ,"already loaded"},
-{AEPHK_R_CLOSE_HANDLES_FAILED            ,"close handles failed"},
-{AEPHK_R_CONNECTIONS_IN_USE              ,"connections in use"},
-{AEPHK_R_CTRL_COMMAND_NOT_IMPLEMENTED    ,"ctrl command not implemented"},
-{AEPHK_R_FINALIZE_FAILED                 ,"finalize failed"},
-{AEPHK_R_GET_HANDLE_FAILED               ,"get handle failed"},
-{AEPHK_R_GET_RANDOM_FAILED               ,"get random failed"},
-{AEPHK_R_INIT_FAILURE                    ,"init failure"},
-{AEPHK_R_MISSING_KEY_COMPONENTS          ,"missing key components"},
-{AEPHK_R_MOD_EXP_CRT_FAILED              ,"mod exp crt failed"},
-{AEPHK_R_MOD_EXP_FAILED                  ,"mod exp failed"},
-{AEPHK_R_NOT_LOADED                      ,"not loaded"},
-{AEPHK_R_OK                              ,"ok"},
-{AEPHK_R_RETURN_CONNECTION_FAILED        ,"return connection failed"},
-{AEPHK_R_SETBNCALLBACK_FAILURE           ,"setbncallback failure"},
-{AEPHK_R_SIZE_TOO_LARGE_OR_TOO_SMALL     ,"size too large or too small"},
-{AEPHK_R_UNIT_FAILURE                    ,"unit failure"},
-{0,NULL}
-        };
-
-#endif
-
-#ifdef AEPHK_LIB_NAME
-static ERR_STRING_DATA AEPHK_lib_name[]=
-        {
-{0      ,AEPHK_LIB_NAME},
-{0,NULL}
-        };
-#endif
-
-
-static int AEPHK_lib_error_code=0;
-static int AEPHK_error_init=1;
-
-static void ERR_load_AEPHK_strings(void)
-        {
-        if (AEPHK_lib_error_code == 0)
-                AEPHK_lib_error_code=ERR_get_next_error_library();
-
-        if (AEPHK_error_init)
-                {
-                AEPHK_error_init=0;
-#ifndef OPENSSL_NO_ERR
-                ERR_load_strings(AEPHK_lib_error_code,AEPHK_str_functs);
-                ERR_load_strings(AEPHK_lib_error_code,AEPHK_str_reasons);
-#endif
-
-#ifdef AEPHK_LIB_NAME
-                AEPHK_lib_name->error = ERR_PACK(AEPHK_lib_error_code,0,0);
-                ERR_load_strings(0,AEPHK_lib_name);
-#endif
-                }
-        }
-
-static void ERR_unload_AEPHK_strings(void)
-        {
-        if (AEPHK_error_init == 0)
-                {
-#ifndef OPENSSL_NO_ERR
-                ERR_unload_strings(AEPHK_lib_error_code,AEPHK_str_functs);
-                ERR_unload_strings(AEPHK_lib_error_code,AEPHK_str_reasons);
-#endif
-
-#ifdef AEPHK_LIB_NAME
-                ERR_unload_strings(0,AEPHK_lib_name);
-#endif
-                AEPHK_error_init=1;
-                }
-        }
-
-static void ERR_AEPHK_error(int function, int reason, char *file, int line)
-        {
-        if (AEPHK_lib_error_code == 0)
-                AEPHK_lib_error_code=ERR_get_next_error_library();
-        ERR_PUT_error(AEPHK_lib_error_code,function,reason,file,line);
-        }
diff --git a/src/lib/libcrypto/engine/hw_atalla_err.c b/src/lib/libcrypto/engine/hw_atalla_err.c
deleted file mode 100644
index 1df9c4570c..0000000000
--- a/src/lib/libcrypto/engine/hw_atalla_err.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* hw_atalla_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include "hw_atalla_err.h"
-
-/* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
-static ERR_STRING_DATA ATALLA_str_functs[]=
-        {
-{ERR_PACK(0,ATALLA_F_ATALLA_CTRL,0),    "ATALLA_CTRL"},
-{ERR_PACK(0,ATALLA_F_ATALLA_FINISH,0),  "ATALLA_FINISH"},
-{ERR_PACK(0,ATALLA_F_ATALLA_INIT,0),    "ATALLA_INIT"},
-{ERR_PACK(0,ATALLA_F_ATALLA_MOD_EXP,0), "ATALLA_MOD_EXP"},
-{ERR_PACK(0,ATALLA_F_ATALLA_RSA_MOD_EXP,0),     "ATALLA_RSA_MOD_EXP"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA ATALLA_str_reasons[]=
-        {
-{ATALLA_R_ALREADY_LOADED                 ,"already loaded"},
-{ATALLA_R_BN_CTX_FULL                    ,"bn ctx full"},
-{ATALLA_R_BN_EXPAND_FAIL                 ,"bn expand fail"},
-{ATALLA_R_CTRL_COMMAND_NOT_IMPLEMENTED   ,"ctrl command not implemented"},
-{ATALLA_R_MISSING_KEY_COMPONENTS         ,"missing key components"},
-{ATALLA_R_NOT_LOADED                     ,"not loaded"},
-{ATALLA_R_REQUEST_FAILED                 ,"request failed"},
-{ATALLA_R_UNIT_FAILURE                   ,"unit failure"},
-{0,NULL}
-        };
-
-#endif
-
-#ifdef ATALLA_LIB_NAME
-static ERR_STRING_DATA ATALLA_lib_name[]=
-        {
-{0      ,ATALLA_LIB_NAME},
-{0,NULL}
-        };
-#endif
-
-
-static int ATALLA_lib_error_code=0;
-static int ATALLA_error_init=1;
-
-static void ERR_load_ATALLA_strings(void)
-        {
-        if (ATALLA_lib_error_code == 0)
-                ATALLA_lib_error_code=ERR_get_next_error_library();
-
-        if (ATALLA_error_init)
-                {
-                ATALLA_error_init=0;
-#ifndef OPENSSL_NO_ERR
-                ERR_load_strings(ATALLA_lib_error_code,ATALLA_str_functs);
-                ERR_load_strings(ATALLA_lib_error_code,ATALLA_str_reasons);
-#endif
-
-#ifdef ATALLA_LIB_NAME
-                ATALLA_lib_name->error = ERR_PACK(ATALLA_lib_error_code,0,0);
-                ERR_load_strings(0,ATALLA_lib_name);
-#endif
-                }
-        }
-
-static void ERR_unload_ATALLA_strings(void)
-        {
-        if (ATALLA_error_init == 0)
-                {
-#ifndef OPENSSL_NO_ERR
-                ERR_unload_strings(ATALLA_lib_error_code,ATALLA_str_functs);
-                ERR_unload_strings(ATALLA_lib_error_code,ATALLA_str_reasons);
-#endif
-
-#ifdef ATALLA_LIB_NAME
-                ERR_unload_strings(0,ATALLA_lib_name);
-#endif
-                ATALLA_error_init=1;
-                }
-        }
-
-static void ERR_ATALLA_error(int function, int reason, char *file, int line)
-        {
-        if (ATALLA_lib_error_code == 0)
-                ATALLA_lib_error_code=ERR_get_next_error_library();
-        ERR_PUT_error(ATALLA_lib_error_code,function,reason,file,line);
-        }
diff --git a/src/lib/libcrypto/engine/hw_cryptodev.c b/src/lib/libcrypto/engine/hw_cryptodev.c
deleted file mode 100644
index 3e7fff1c1e..0000000000
--- a/src/lib/libcrypto/engine/hw_cryptodev.c
+++ /dev/null
@@ -1,1135 +0,0 @@
-/*
- * Copyright (c) 2002 Bob Beck <beck@openbsd.org>
- * Copyright (c) 2002 Theo de Raadt
- * Copyright (c) 2002 Markus Friedl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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.
- *
- */
-
-#include <openssl/objects.h>
-#include <openssl/engine.h>
-#include <openssl/evp.h>
-
-#if (defined(__unix__) || defined(unix)) && !defined(USG)
-#include <sys/param.h>
-# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
-# define HAVE_CRYPTODEV
-# endif
-# if (OpenBSD >= 200110)
-# define HAVE_SYSLOG_R
-# endif
-#endif
-
-#ifndef HAVE_CRYPTODEV
-
-void
-ENGINE_load_cryptodev(void)
-{
-        /* This is a NOP on platforms without /dev/crypto */
-        return;
-}
-
-#else 
-
-#include <sys/types.h>
-#include <crypto/cryptodev.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <errno.h>
-#include <string.h>
-
-struct dev_crypto_state {
-        struct session_op d_sess;
-        int d_fd;
-};
-
-static u_int32_t cryptodev_asymfeat = 0;
-
-static int get_asym_dev_crypto(void);
-static int open_dev_crypto(void);
-static int get_dev_crypto(void);
-static int cryptodev_max_iv(int cipher);
-static int cryptodev_key_length_valid(int cipher, int len);
-static int cipher_nid_to_cryptodev(int nid);
-static int get_cryptodev_ciphers(const int **cnids);
-/*static int get_cryptodev_digests(const int **cnids);*/
-static int cryptodev_usable_ciphers(const int **nids);
-static int cryptodev_usable_digests(const int **nids);
-static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, unsigned int inl);
-static int cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc);
-static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx);
-static int cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-    const int **nids, int nid);
-static int cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
-    const int **nids, int nid);
-static int bn2crparam(const BIGNUM *a, struct crparam *crp);
-static int crparam2bn(struct crparam *crp, BIGNUM *a);
-static void zapparams(struct crypt_kop *kop);
-static int cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r,
-    int slen, BIGNUM *s);
-
-static int cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I,
-    RSA *rsa);
-static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-static int cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
-    BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p,
-    BN_CTX *ctx, BN_MONT_CTX *mont);
-static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst,
-    int dlen, DSA *dsa);
-static int cryptodev_dsa_verify(const unsigned char *dgst, int dgst_len,
-    DSA_SIG *sig, DSA *dsa);
-static int cryptodev_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-    BN_MONT_CTX *m_ctx);
-static int cryptodev_dh_compute_key(unsigned char *key,
-    const BIGNUM *pub_key, DH *dh);
-static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
-    void (*f)());
-void ENGINE_load_cryptodev(void);
-
-static const ENGINE_CMD_DEFN cryptodev_defns[] = {
-        { 0, NULL, NULL, 0 }
-};
-
-static struct {
-        int     id;
-        int     nid;
-        int     ivmax;
-        int     keylen;
-} ciphers[] = {
-        { CRYPTO_DES_CBC,               NID_des_cbc,            8,       8, },
-        { CRYPTO_3DES_CBC,              NID_des_ede3_cbc,       8,      24, },
-        { CRYPTO_AES_CBC,               NID_aes_128_cbc,        16,     16, },
-        { CRYPTO_BLF_CBC,               NID_bf_cbc,             8,      16, },
-        { CRYPTO_CAST_CBC,              NID_cast5_cbc,          8,      16, },
-        { CRYPTO_SKIPJACK_CBC,          NID_undef,              0,       0, },
-        { 0,                            NID_undef,              0,       0, },
-};
-
-#if 0 /* UNUSED */
-static struct {
-        int     id;
-        int     nid;
-} digests[] = {
-        { CRYPTO_SHA1_HMAC,             NID_hmacWithSHA1,       },
-        { CRYPTO_RIPEMD160_HMAC,        NID_ripemd160,          },
-        { CRYPTO_MD5_KPDK,              NID_undef,              },
-        { CRYPTO_SHA1_KPDK,             NID_undef,              },
-        { CRYPTO_MD5,                   NID_md5,                },
-        { CRYPTO_SHA1,                  NID_undef,              },
-        { 0,                            NID_undef,              },
-};
-#endif
-
-/*
- * Return a fd if /dev/crypto seems usable, 0 otherwise.
- */
-static int
-open_dev_crypto(void)
-{
-        static int fd = -1;
-
-        if (fd == -1) {
-                if ((fd = open("/dev/crypto", O_RDWR, 0)) == -1)
-                        return (-1);
-                /* close on exec */
-                if (fcntl(fd, F_SETFD, 1) == -1) {
-                        close(fd);
-                        fd = -1;
-                        return (-1);
-                }
-        }
-        return (fd);
-}
-
-static int
-get_dev_crypto(void)
-{
-        int fd, retfd;
-
-        if ((fd = open_dev_crypto()) == -1)
-                return (-1);
-        if (ioctl(fd, CRIOGET, &retfd) == -1)
-                return (-1);
-
-        /* close on exec */
-        if (fcntl(retfd, F_SETFD, 1) == -1) {
-                close(retfd);
-                return (-1);
-        }
-        return (retfd);
-}
-
-/* Caching version for asym operations */
-static int
-get_asym_dev_crypto(void)
-{
-        static int fd = -1;
-
-        if (fd == -1)
-                fd = get_dev_crypto();
-        return fd;
-}
-
-/*
- * XXXX this needs to be set for each alg - and determined from
- * a running card.
- */
-static int
-cryptodev_max_iv(int cipher)
-{
-        int i;
-
-        for (i = 0; ciphers[i].id; i++)
-                if (ciphers[i].id == cipher)
-                        return (ciphers[i].ivmax);
-        return (0);
-}
-
-/*
- * XXXX this needs to be set for each alg - and determined from
- * a running card. For now, fake it out - but most of these
- * for real devices should return 1 for the supported key
- * sizes the device can handle.
- */
-static int
-cryptodev_key_length_valid(int cipher, int len)
-{
-        int i;
-
-        for (i = 0; ciphers[i].id; i++)
-                if (ciphers[i].id == cipher)
-                        return (ciphers[i].keylen == len);
-        return (0);
-}
-
-/* convert libcrypto nids to cryptodev */
-static int
-cipher_nid_to_cryptodev(int nid)
-{
-        int i;
-
-        for (i = 0; ciphers[i].id; i++)
-                if (ciphers[i].nid == nid)
-                        return (ciphers[i].id);
-        return (0);
-}
-
-/*
- * Find out what ciphers /dev/crypto will let us have a session for.
- * XXX note, that some of these openssl doesn't deal with yet!
- * returning them here is harmless, as long as we return NULL
- * when asked for a handler in the cryptodev_engine_ciphers routine
- */
-static int
-get_cryptodev_ciphers(const int **cnids)
-{
-        static int nids[CRYPTO_ALGORITHM_MAX];
-        struct session_op sess;
-        int fd, i, count = 0;
-
-        if ((fd = get_dev_crypto()) < 0) {
-                *cnids = NULL;
-                return (0);
-        }
-        memset(&sess, 0, sizeof(sess));
-        sess.key = (caddr_t)"123456781234567812345678";
-
-        for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
-                if (ciphers[i].nid == NID_undef)
-                        continue;
-                sess.cipher = ciphers[i].id;
-                sess.keylen = ciphers[i].keylen;
-                sess.mac = 0;
-                if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
-                    ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
-                        nids[count++] = ciphers[i].nid;
-        }
-        close(fd);
-
-        if (count > 0)
-                *cnids = nids;
-        else
-                *cnids = NULL;
-        return (count);
-}
-
-/*
- * Find out what digests /dev/crypto will let us have a session for.
- * XXX note, that some of these openssl doesn't deal with yet!
- * returning them here is harmless, as long as we return NULL
- * when asked for a handler in the cryptodev_engine_digests routine
- */
-#if 0 /* UNUSED */
-static int
-get_cryptodev_digests(const int **cnids)
-{
-        static int nids[CRYPTO_ALGORITHM_MAX];
-        struct session_op sess;
-        int fd, i, count = 0;
-
-        if ((fd = get_dev_crypto()) < 0) {
-                *cnids = NULL;
-                return (0);
-        }
-        memset(&sess, 0, sizeof(sess));
-        for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
-                if (digests[i].nid == NID_undef)
-                        continue;
-                sess.mac = digests[i].id;
-                sess.cipher = 0;
-                if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
-                    ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
-                        nids[count++] = digests[i].nid;
-        }
-        close(fd);
-
-        if (count > 0)
-                *cnids = nids;
-        else
-                *cnids = NULL;
-        return (count);
-}
-#endif
-
-/*
- * Find the useable ciphers|digests from dev/crypto - this is the first
- * thing called by the engine init crud which determines what it
- * can use for ciphers from this engine. We want to return
- * only what we can do, anythine else is handled by software.
- *
- * If we can't initialize the device to do anything useful for
- * any reason, we want to return a NULL array, and 0 length,
- * which forces everything to be done is software. By putting
- * the initalization of the device in here, we ensure we can
- * use this engine as the default, and if for whatever reason
- * /dev/crypto won't do what we want it will just be done in
- * software
- *
- * This can (should) be greatly expanded to perhaps take into
- * account speed of the device, and what we want to do.
- * (although the disabling of particular alg's could be controlled
- * by the device driver with sysctl's.) - this is where we
- * want most of the decisions made about what we actually want
- * to use from /dev/crypto.
- */
-static int
-cryptodev_usable_ciphers(const int **nids)
-{
-        return (get_cryptodev_ciphers(nids));
-}
-
-static int
-cryptodev_usable_digests(const int **nids)
-{
-        /*
-         * XXXX just disable all digests for now, because it sucks.
-         * we need a better way to decide this - i.e. I may not
-         * want digests on slow cards like hifn on fast machines,
-         * but might want them on slow or loaded machines, etc.
-         * will also want them when using crypto cards that don't
-         * suck moose gonads - would be nice to be able to decide something
-         * as reasonable default without having hackery that's card dependent.
-         * of course, the default should probably be just do everything,
-         * with perhaps a sysctl to turn algoritms off (or have them off
-         * by default) on cards that generally suck like the hifn.
-         */
-        *nids = NULL;
-        return (0);
-}
-
-static int
-cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, unsigned int inl)
-{
-        struct crypt_op cryp;
-        struct dev_crypto_state *state = ctx->cipher_data;
-        struct session_op *sess = &state->d_sess;
-        void *iiv;
-        unsigned char save_iv[EVP_MAX_IV_LENGTH];
-
-        if (state->d_fd < 0)
-                return (0);
-        if (!inl)
-                return (1);
-        if ((inl % ctx->cipher->block_size) != 0)
-                return (0);
-
-        memset(&cryp, 0, sizeof(cryp));
-
-        cryp.ses = sess->ses;
-        cryp.flags = 0;
-        cryp.len = inl;
-        cryp.src = (caddr_t) in;
-        cryp.dst = (caddr_t) out;
-        cryp.mac = 0;
-
-        cryp.op = ctx->encrypt ? COP_ENCRYPT : COP_DECRYPT;
-
-        if (ctx->cipher->iv_len) {
-                cryp.iv = (caddr_t) ctx->iv;
-                if (!ctx->encrypt) {
-                        iiv = (void *) in + inl - ctx->cipher->iv_len;
-                        memcpy(save_iv, iiv, ctx->cipher->iv_len);
-                }
-        } else
-                cryp.iv = NULL;
-
-        if (ioctl(state->d_fd, CIOCCRYPT, &cryp) == -1) {
-                /* XXX need better errror handling
-                 * this can fail for a number of different reasons.
-                 */
-                return (0);
-        }
-
-        if (ctx->cipher->iv_len) {
-                if (ctx->encrypt)
-                        iiv = (void *) out + inl - ctx->cipher->iv_len;
-                else
-                        iiv = save_iv;
-                memcpy(ctx->iv, iiv, ctx->cipher->iv_len);
-        }
-        return (1);
-}
-
-static int
-cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc)
-{
-        struct dev_crypto_state *state = ctx->cipher_data;
-        struct session_op *sess = &state->d_sess;
-        int cipher;
-
-        if ((cipher = cipher_nid_to_cryptodev(ctx->cipher->nid)) == NID_undef)
-                return (0);
-
-        if (ctx->cipher->iv_len > cryptodev_max_iv(cipher))
-                return (0);
-
-        if (!cryptodev_key_length_valid(cipher, ctx->key_len))
-                return (0);
-
-        memset(sess, 0, sizeof(struct session_op));
-
-        if ((state->d_fd = get_dev_crypto()) < 0)
-                return (0);
-
-        sess->key = (unsigned char *)key;
-        sess->keylen = ctx->key_len;
-        sess->cipher = cipher;
-
-        if (ioctl(state->d_fd, CIOCGSESSION, sess) == -1) {
-                close(state->d_fd);
-                state->d_fd = -1;
-                return (0);
-        }
-        return (1);
-}
-
-/*
- * free anything we allocated earlier when initting a
- * session, and close the session.
- */
-static int
-cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
-{
-        int ret = 0;
-        struct dev_crypto_state *state = ctx->cipher_data;
-        struct session_op *sess = &state->d_sess;
-
-        if (state->d_fd < 0)
-                return (0);
-
-        /* XXX if this ioctl fails, someting's wrong. the invoker
-         * may have called us with a bogus ctx, or we could
-         * have a device that for whatever reason just doesn't
-         * want to play ball - it's not clear what's right
-         * here - should this be an error? should it just
-         * increase a counter, hmm. For right now, we return
-         * 0 - I don't believe that to be "right". we could
-         * call the gorpy openssl lib error handlers that
-         * print messages to users of the library. hmm..
-         */
-
-        if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) == -1) {
-                ret = 0;
-        } else {
-                ret = 1;
-        }
-        close(state->d_fd);
-        state->d_fd = -1;
-
-        return (ret);
-}
-
-/*
- * libcrypto EVP stuff - this is how we get wired to EVP so the engine
- * gets called when libcrypto requests a cipher NID.
- */
-
-/* DES CBC EVP */
-const EVP_CIPHER cryptodev_des_cbc = {
-        NID_des_cbc,
-        8, 8, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-/* 3DES CBC EVP */
-const EVP_CIPHER cryptodev_3des_cbc = {
-        NID_des_ede3_cbc,
-        8, 24, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-const EVP_CIPHER cryptodev_bf_cbc = {
-        NID_bf_cbc,
-        8, 16, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-const EVP_CIPHER cryptodev_cast_cbc = {
-        NID_cast5_cbc,
-        8, 16, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-const EVP_CIPHER cryptodev_aes_cbc = {
-        NID_aes_128_cbc,
-        16, 16, 16,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-/*
- * Registered by the ENGINE when used to find out how to deal with
- * a particular NID in the ENGINE. this says what we'll do at the
- * top level - note, that list is restricted by what we answer with
- */
-static int
-cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-    const int **nids, int nid)
-{
-        if (!cipher)
-                return (cryptodev_usable_ciphers(nids));
-
-        switch (nid) {
-        case NID_des_ede3_cbc:
-                *cipher = &cryptodev_3des_cbc;
-                break;
-        case NID_des_cbc:
-                *cipher = &cryptodev_des_cbc;
-                break;
-        case NID_bf_cbc:
-                *cipher = &cryptodev_bf_cbc;
-                break;
-        case NID_cast5_cbc:
-                *cipher = &cryptodev_cast_cbc;
-                break;
-        case NID_aes_128_cbc:
-                *cipher = &cryptodev_aes_cbc;
-                break;
-        default:
-                *cipher = NULL;
-                break;
-        }
-        return (*cipher != NULL);
-}
-
-static int
-cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
-    const int **nids, int nid)
-{
-        if (!digest)
-                return (cryptodev_usable_digests(nids));
-
-        switch (nid) {
-        case NID_md5:
-                *digest = NULL; /* need to make a clean md5 critter */
-                break;
-        default:
-                *digest = NULL;
-                break;
-        }
-        return (*digest != NULL);
-}
-
-/*
- * Convert a BIGNUM to the representation that /dev/crypto needs.
- * Upon completion of use, the caller is responsible for freeing
- * crp->crp_p.
- */
-static int
-bn2crparam(const BIGNUM *a, struct crparam *crp)
-{
-        int i, j, k;
-        ssize_t bytes, bits;
-        u_char *b;
-
-        crp->crp_p = NULL;
-        crp->crp_nbits = 0;
-
-        bits = BN_num_bits(a);
-        bytes = (bits + 7) / 8;
-
-        b = malloc(bytes);
-        if (b == NULL)
-                return (1);
-
-        crp->crp_p = b;
-        crp->crp_nbits = bits;
-
-        for (i = 0, j = 0; i < a->top; i++) {
-                for (k = 0; k < BN_BITS2 / 8; k++) {
-                        if ((j + k) >= bytes)
-                                return (0);
-                        b[j + k] = a->d[i] >> (k * 8);
-                }
-                j += BN_BITS2 / 8;
-        }
-        return (0);
-}
-
-/* Convert a /dev/crypto parameter to a BIGNUM */
-static int
-crparam2bn(struct crparam *crp, BIGNUM *a)
-{
-        u_int8_t *pd;
-        int i, bytes;
-
-        bytes = (crp->crp_nbits + 7) / 8;
-
-        if (bytes == 0)
-                return (-1);
-
-        if ((pd = (u_int8_t *) malloc(bytes)) == NULL)
-                return (-1);
-
-        for (i = 0; i < bytes; i++)
-                pd[i] = crp->crp_p[bytes - i - 1];
-
-        BN_bin2bn(pd, bytes, a);
-        free(pd);
-
-        return (0);
-}
-
-static void
-zapparams(struct crypt_kop *kop)
-{
-        int i;
-
-        for (i = 0; i <= kop->crk_iparams + kop->crk_oparams; i++) {
-                if (kop->crk_param[i].crp_p)
-                        free(kop->crk_param[i].crp_p);
-                kop->crk_param[i].crp_p = NULL;
-                kop->crk_param[i].crp_nbits = 0;
-        }
-}
-
-static int
-cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, BIGNUM *s)
-{
-        int fd, ret = -1;
-
-        if ((fd = get_asym_dev_crypto()) < 0)
-                return (ret);
-
-        if (r) {
-                kop->crk_param[kop->crk_iparams].crp_p = calloc(rlen, sizeof(char));
-                kop->crk_param[kop->crk_iparams].crp_nbits = rlen * 8;
-                kop->crk_oparams++;
-        }
-        if (s) {
-                kop->crk_param[kop->crk_iparams+1].crp_p = calloc(slen, sizeof(char));
-                kop->crk_param[kop->crk_iparams+1].crp_nbits = slen * 8;
-                kop->crk_oparams++;
-        }
-
-        if (ioctl(fd, CIOCKEY, kop) == 0) {
-                if (r)
-                        crparam2bn(&kop->crk_param[kop->crk_iparams], r);
-                if (s)
-                        crparam2bn(&kop->crk_param[kop->crk_iparams+1], s);
-                ret = 0;
-        }
-
-        return (ret);
-}
-
-static int
-cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
-{
-        struct crypt_kop kop;
-        int ret = 1;
-
-        /* Currently, we know we can do mod exp iff we can do any
-         * asymmetric operations at all.
-         */
-        if (cryptodev_asymfeat == 0) {
-                ret = BN_mod_exp(r, a, p, m, ctx);
-                return (ret);
-        }
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_MOD_EXP;
-
-        /* inputs: a^p % m */
-        if (bn2crparam(a, &kop.crk_param[0]))
-                goto err;
-        if (bn2crparam(p, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(m, &kop.crk_param[2]))
-                goto err;
-        kop.crk_iparams = 3;
-
-        if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL) == -1) {
-                const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-                ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
-        }
-err:
-        zapparams(&kop);
-        return (ret);
-}
-
-static int
-cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-{
-        int r;
-        BN_CTX *ctx;
-
-        ctx = BN_CTX_new();
-        r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL);
-        BN_CTX_free(ctx);
-        return (r);
-}
-
-static int
-cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-{
-        struct crypt_kop kop;
-        int ret = 1;
-
-        if (!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp) {
-                /* XXX 0 means failure?? */
-                return (0);
-        }
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_MOD_EXP_CRT;
-        /* inputs: rsa->p rsa->q I rsa->dmp1 rsa->dmq1 rsa->iqmp */
-        if (bn2crparam(rsa->p, &kop.crk_param[0]))
-                goto err;
-        if (bn2crparam(rsa->q, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(I, &kop.crk_param[2]))
-                goto err;
-        if (bn2crparam(rsa->dmp1, &kop.crk_param[3]))
-                goto err;
-        if (bn2crparam(rsa->dmq1, &kop.crk_param[4]))
-                goto err;
-        if (bn2crparam(rsa->iqmp, &kop.crk_param[5]))
-                goto err;
-        kop.crk_iparams = 6;
-
-        if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL) == -1) {
-                const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-                ret = (*meth->rsa_mod_exp)(r0, I, rsa);
-        }
-err:
-        zapparams(&kop);
-        return (ret);
-}
-
-static RSA_METHOD cryptodev_rsa = {
-        "cryptodev RSA method",
-        NULL,                           /* rsa_pub_enc */
-        NULL,                           /* rsa_pub_dec */
-        NULL,                           /* rsa_priv_enc */
-        NULL,                           /* rsa_priv_dec */
-        NULL,
-        NULL,
-        NULL,                           /* init */
-        NULL,                           /* finish */
-        0,                              /* flags */
-        NULL,                           /* app_data */
-        NULL,                           /* rsa_sign */
-        NULL                            /* rsa_verify */
-};
-
-static int
-cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-{
-        return (cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx));
-}
-
-static int
-cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
-    BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p,
-    BN_CTX *ctx, BN_MONT_CTX *mont)
-{
-        BIGNUM t2;
-        int ret = 0;
-
-        BN_init(&t2);
-
-        /* v = ( g^u1 * y^u2 mod p ) mod q */
-        /* let t1 = g ^ u1 mod p */
-        ret = 0;
-
-        if (!dsa->meth->bn_mod_exp(dsa,t1,dsa->g,u1,dsa->p,ctx,mont))
-                goto err;
-
-        /* let t2 = y ^ u2 mod p */
-        if (!dsa->meth->bn_mod_exp(dsa,&t2,dsa->pub_key,u2,dsa->p,ctx,mont))
-                goto err;
-        /* let u1 = t1 * t2 mod p */
-        if (!BN_mod_mul(u1,t1,&t2,dsa->p,ctx))
-                goto err;
-
-        BN_copy(t1,u1);
-
-        ret = 1;
-err:
-        BN_free(&t2);
-        return(ret);
-}
-
-static DSA_SIG *
-cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
-{
-        struct crypt_kop kop;
-        BIGNUM *r = NULL, *s = NULL;
-        DSA_SIG *dsaret = NULL;
-
-        if ((r = BN_new()) == NULL)
-                goto err;
-        if ((s = BN_new()) == NULL) {
-                BN_free(r);
-                goto err;
-        }
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_DSA_SIGN;
-
-        /* inputs: dgst dsa->p dsa->q dsa->g dsa->priv_key */
-        kop.crk_param[0].crp_p = (caddr_t)dgst;
-        kop.crk_param[0].crp_nbits = dlen * 8;
-        if (bn2crparam(dsa->p, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(dsa->q, &kop.crk_param[2]))
-                goto err;
-        if (bn2crparam(dsa->g, &kop.crk_param[3]))
-                goto err;
-        if (bn2crparam(dsa->priv_key, &kop.crk_param[4]))
-                goto err;
-        kop.crk_iparams = 5;
-
-        if (cryptodev_asym(&kop, BN_num_bytes(dsa->q), r,
-            BN_num_bytes(dsa->q), s) == 0) {
-                dsaret = DSA_SIG_new();
-                dsaret->r = r;
-                dsaret->s = s;
-        } else {
-                const DSA_METHOD *meth = DSA_OpenSSL();
-                BN_free(r);
-                BN_free(s);
-                dsaret = (meth->dsa_do_sign)(dgst, dlen, dsa);
-        }
-err:
-        kop.crk_param[0].crp_p = NULL;
-        zapparams(&kop);
-        return (dsaret);
-}
-
-static int
-cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
-    DSA_SIG *sig, DSA *dsa)
-{
-        struct crypt_kop kop;
-        int dsaret = 1;
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_DSA_VERIFY;
-
-        /* inputs: dgst dsa->p dsa->q dsa->g dsa->pub_key sig->r sig->s */
-        kop.crk_param[0].crp_p = (caddr_t)dgst;
-        kop.crk_param[0].crp_nbits = dlen * 8;
-        if (bn2crparam(dsa->p, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(dsa->q, &kop.crk_param[2]))
-                goto err;
-        if (bn2crparam(dsa->g, &kop.crk_param[3]))
-                goto err;
-        if (bn2crparam(dsa->pub_key, &kop.crk_param[4]))
-                goto err;
-        if (bn2crparam(sig->r, &kop.crk_param[5]))
-                goto err;
-        if (bn2crparam(sig->s, &kop.crk_param[6]))
-                goto err;
-        kop.crk_iparams = 7;
-
-        if (cryptodev_asym(&kop, 0, NULL, 0, NULL) == 0) {
-                dsaret = kop.crk_status;
-        } else {
-                const DSA_METHOD *meth = DSA_OpenSSL();
-
-                dsaret = (meth->dsa_do_verify)(dgst, dlen, sig, dsa);
-        }
-err:
-        kop.crk_param[0].crp_p = NULL;
-        zapparams(&kop);
-        return (dsaret);
-}
-
-static DSA_METHOD cryptodev_dsa = {
-        "cryptodev DSA method",
-        NULL,
-        NULL,                           /* dsa_sign_setup */
-        NULL,
-        NULL,                           /* dsa_mod_exp */
-        NULL,
-        NULL,                           /* init */
-        NULL,                           /* finish */
-        0,      /* flags */
-        NULL    /* app_data */
-};
-
-static int
-cryptodev_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-    BN_MONT_CTX *m_ctx)
-{
-        return (cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx));
-}
-
-static int
-cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
-{
-        struct crypt_kop kop;
-        int dhret = 1;
-        int fd, keylen;
-
-        if ((fd = get_asym_dev_crypto()) < 0) {
-                const DH_METHOD *meth = DH_OpenSSL();
-
-                return ((meth->compute_key)(key, pub_key, dh));
-        }
-
-        keylen = BN_num_bits(dh->p);
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_DH_COMPUTE_KEY;
-
-        /* inputs: dh->priv_key pub_key dh->p key */
-        if (bn2crparam(dh->priv_key, &kop.crk_param[0]))
-                goto err;
-        if (bn2crparam(pub_key, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(dh->p, &kop.crk_param[2]))
-                goto err;
-        kop.crk_iparams = 3;
-
-        kop.crk_param[3].crp_p = key;
-        kop.crk_param[3].crp_nbits = keylen * 8;
-        kop.crk_oparams = 1;
-
-        if (ioctl(fd, CIOCKEY, &kop) == -1) {
-                const DH_METHOD *meth = DH_OpenSSL();
-
-                dhret = (meth->compute_key)(key, pub_key, dh);
-        }
-err:
-        kop.crk_param[3].crp_p = NULL;
-        zapparams(&kop);
-        return (dhret);
-}
-
-static DH_METHOD cryptodev_dh = {
-        "cryptodev DH method",
-        NULL,                           /* cryptodev_dh_generate_key */
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        0,      /* flags */
-        NULL    /* app_data */
-};
-
-/*
- * ctrl right now is just a wrapper that doesn't do much
- * but I expect we'll want some options soon.
- */
-static int
-cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-{
-#ifdef HAVE_SYSLOG_R
-        struct syslog_data sd = SYSLOG_DATA_INIT;
-#endif
-
-        switch (cmd) {
-        default:
-#ifdef HAVE_SYSLOG_R
-                syslog_r(LOG_ERR, &sd,
-                    "cryptodev_ctrl: unknown command %d", cmd);
-#else
-                syslog(LOG_ERR, "cryptodev_ctrl: unknown command %d", cmd);
-#endif
-                break;
-        }
-        return (1);
-}
-
-void
-ENGINE_load_cryptodev(void)
-{
-        ENGINE *engine = ENGINE_new();
-        int fd;
-
-        if (engine == NULL)
-                return;
-        if ((fd = get_dev_crypto()) < 0) {
-                ENGINE_free(engine);
-                return;
-        }
-
-        /*
-         * find out what asymmetric crypto algorithms we support
-         */
-        if (ioctl(fd, CIOCASYMFEAT, &cryptodev_asymfeat) == -1) {
-                close(fd);
-                ENGINE_free(engine);
-                return;
-        }
-        close(fd);
-
-        if (!ENGINE_set_id(engine, "cryptodev") ||
-            !ENGINE_set_name(engine, "BSD cryptodev engine") ||
-            !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
-            !ENGINE_set_digests(engine, cryptodev_engine_digests) ||
-            !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) ||
-            !ENGINE_set_cmd_defns(engine, cryptodev_defns)) {
-                ENGINE_free(engine);
-                return;
-        }
-
-        if (ENGINE_set_RSA(engine, &cryptodev_rsa)) {
-                const RSA_METHOD *rsa_meth = RSA_PKCS1_SSLeay();
-
-                cryptodev_rsa.bn_mod_exp = rsa_meth->bn_mod_exp;
-                cryptodev_rsa.rsa_mod_exp = rsa_meth->rsa_mod_exp;
-                cryptodev_rsa.rsa_pub_enc = rsa_meth->rsa_pub_enc;
-                cryptodev_rsa.rsa_pub_dec = rsa_meth->rsa_pub_dec;
-                cryptodev_rsa.rsa_priv_enc = rsa_meth->rsa_priv_enc;
-                cryptodev_rsa.rsa_priv_dec = rsa_meth->rsa_priv_dec;
-                if (cryptodev_asymfeat & CRF_MOD_EXP) {
-                        cryptodev_rsa.bn_mod_exp = cryptodev_bn_mod_exp;
-                        if (cryptodev_asymfeat & CRF_MOD_EXP_CRT)
-                                cryptodev_rsa.rsa_mod_exp =
-                                    cryptodev_rsa_mod_exp;
-                        else
-                                cryptodev_rsa.rsa_mod_exp =
-                                    cryptodev_rsa_nocrt_mod_exp;
-                }
-        }
-
-        if (ENGINE_set_DSA(engine, &cryptodev_dsa)) {
-                const DSA_METHOD *meth = DSA_OpenSSL();
-
-                memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD));
-                if (cryptodev_asymfeat & CRF_DSA_SIGN)
-                        cryptodev_dsa.dsa_do_sign = cryptodev_dsa_do_sign;
-                if (cryptodev_asymfeat & CRF_MOD_EXP) {
-                        cryptodev_dsa.bn_mod_exp = cryptodev_dsa_bn_mod_exp;
-                        cryptodev_dsa.dsa_mod_exp = cryptodev_dsa_dsa_mod_exp;
-                }
-                if (cryptodev_asymfeat & CRF_DSA_VERIFY)
-                        cryptodev_dsa.dsa_do_verify = cryptodev_dsa_verify;
-        }
-
-        if (ENGINE_set_DH(engine, &cryptodev_dh)){
-                const DH_METHOD *dh_meth = DH_OpenSSL();
-
-                cryptodev_dh.generate_key = dh_meth->generate_key;
-                cryptodev_dh.compute_key = dh_meth->compute_key;
-                cryptodev_dh.bn_mod_exp = dh_meth->bn_mod_exp;
-                if (cryptodev_asymfeat & CRF_MOD_EXP) {
-                        cryptodev_dh.bn_mod_exp = cryptodev_mod_exp_dh;
-                        if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY)
-                                cryptodev_dh.compute_key =
-                                    cryptodev_dh_compute_key;
-                }
-        }
-
-        ENGINE_add(engine);
-        ENGINE_free(engine);
-        ERR_clear_error();
-}
-
-#endif /* HAVE_CRYPTODEV */
diff --git a/src/lib/libcrypto/engine/hw_cswift_err.c b/src/lib/libcrypto/engine/hw_cswift_err.c
deleted file mode 100644
index 684f53bf27..0000000000
--- a/src/lib/libcrypto/engine/hw_cswift_err.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* hw_cswift_err.c */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include "hw_cswift_err.h"
-
-/* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
-static ERR_STRING_DATA CSWIFT_str_functs[]=
-        {
-{ERR_PACK(0,CSWIFT_F_CSWIFT_CTRL,0),    "CSWIFT_CTRL"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_DSA_SIGN,0),        "CSWIFT_DSA_SIGN"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_DSA_VERIFY,0),      "CSWIFT_DSA_VERIFY"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_FINISH,0),  "CSWIFT_FINISH"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_INIT,0),    "CSWIFT_INIT"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_MOD_EXP,0), "CSWIFT_MOD_EXP"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_MOD_EXP_CRT,0),     "CSWIFT_MOD_EXP_CRT"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_RSA_MOD_EXP,0),     "CSWIFT_RSA_MOD_EXP"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA CSWIFT_str_reasons[]=
-        {
-{CSWIFT_R_ALREADY_LOADED                 ,"already loaded"},
-{CSWIFT_R_BAD_KEY_SIZE                   ,"bad key size"},
-{CSWIFT_R_BN_CTX_FULL                    ,"bn ctx full"},
-{CSWIFT_R_BN_EXPAND_FAIL                 ,"bn expand fail"},
-{CSWIFT_R_CTRL_COMMAND_NOT_IMPLEMENTED   ,"ctrl command not implemented"},
-{CSWIFT_R_MISSING_KEY_COMPONENTS         ,"missing key components"},
-{CSWIFT_R_NOT_LOADED                     ,"not loaded"},
-{CSWIFT_R_REQUEST_FAILED                 ,"request failed"},
-{CSWIFT_R_UNIT_FAILURE                   ,"unit failure"},
-{0,NULL}
-        };
-
-#endif
-
-#ifdef CSWIFT_LIB_NAME
-static ERR_STRING_DATA CSWIFT_lib_name[]=
-        {
-{0      ,CSWIFT_LIB_NAME},
-{0,NULL}
-        };
-#endif
-
-
-static int CSWIFT_lib_error_code=0;
-static int CSWIFT_error_init=1;
-
-static void ERR_load_CSWIFT_strings(void)
-        {
-        if (CSWIFT_lib_error_code == 0)
-                CSWIFT_lib_error_code=ERR_get_next_error_library();
-
-        if (CSWIFT_error_init)
-                {
-                CSWIFT_error_init=0;
-#ifndef OPENSSL_NO_ERR
-                ERR_load_strings(CSWIFT_lib_error_code,CSWIFT_str_functs);
-                ERR_load_strings(CSWIFT_lib_error_code,CSWIFT_str_reasons);
-#endif
-
-#ifdef CSWIFT_LIB_NAME
-                CSWIFT_lib_name->error = ERR_PACK(CSWIFT_lib_error_code,0,0);
-                ERR_load_strings(0,CSWIFT_lib_name);
-#endif
-                }
-        }
-
-static void ERR_unload_CSWIFT_strings(void)
-        {
-        if (CSWIFT_error_init == 0)
-                {
-#ifndef OPENSSL_NO_ERR
-                ERR_unload_strings(CSWIFT_lib_error_code,CSWIFT_str_functs);
-                ERR_unload_strings(CSWIFT_lib_error_code,CSWIFT_str_reasons);
-#endif
-
-#ifdef CSWIFT_LIB_NAME
-                ERR_unload_strings(0,CSWIFT_lib_name);
-#endif
-                CSWIFT_error_init=1;
-                }
-        }
-
-static void ERR_CSWIFT_error(int function, int reason, char *file, int line)
-        {
-        if (CSWIFT_lib_error_code == 0)
-                CSWIFT_lib_error_code=ERR_get_next_error_library();
-        ERR_PUT_error(CSWIFT_lib_error_code,function,reason,file,line);
-        }
diff --git a/src/lib/libcrypto/engine/hw_ncipher.c b/src/lib/libcrypto/engine/hw_ncipher.c
deleted file mode 100644
index 0d1c6b8df0..0000000000
--- a/src/lib/libcrypto/engine/hw_ncipher.c
+++ /dev/null
@@ -1,1388 +0,0 @@
-/* crypto/engine/hw_ncipher.c -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (richard@levitte.org), Geoff Thorpe
- * (geoff@geoffthorpe.net) and Dr Stephen N Henson (shenson@bigfoot.com)
- * for the OpenSSL project 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "cryptlib.h"
-#include <openssl/crypto.h>
-#include <openssl/pem.h>
-#include <openssl/dso.h>
-#include <openssl/engine.h>
-#include <openssl/ui.h>
-
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_NCIPHER
-
-/* Attribution notice: nCipher have said several times that it's OK for
- * us to implement a general interface to their boxes, and recently declared
- * their HWCryptoHook to be public, and therefore available for us to use.
- * Thanks, nCipher.
- *
- * The hwcryptohook.h included here is from May 2000.
- * [Richard Levitte]
- */
-#ifdef FLAT_INC
-#include "hwcryptohook.h"
-#else
-#include "vendor_defns/hwcryptohook.h"
-#endif
-
-#define HWCRHK_LIB_NAME "hwcrhk engine"
-#include "hw_ncipher_err.c"
-
-static int hwcrhk_destroy(ENGINE *e);
-static int hwcrhk_init(ENGINE *e);
-static int hwcrhk_finish(ENGINE *e);
-static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); 
-
-/* Functions to handle mutexes if have dynamic locks */
-static int hwcrhk_mutex_init(HWCryptoHook_Mutex*, HWCryptoHook_CallerContext*);
-static int hwcrhk_mutex_lock(HWCryptoHook_Mutex*);
-static void hwcrhk_mutex_unlock(HWCryptoHook_Mutex*);
-static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex*);
-#if 1 /* This is a HACK which will disappear in 0.9.8 */
-/* Functions to handle mutexes if only have static locks */
-static int hwcrhk_static_mutex_init(HWCryptoHook_Mutex *m,
-                                    HWCryptoHook_CallerContext *c);
-static int hwcrhk_static_mutex_lock(HWCryptoHook_Mutex *m);
-static void hwcrhk_static_mutex_unlock(HWCryptoHook_Mutex *m);
-static void hwcrhk_static_mutex_destroy(HWCryptoHook_Mutex *m);
-#endif
-
-/* BIGNUM stuff */
-static int hwcrhk_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx);
-
-#ifndef OPENSSL_NO_RSA
-/* RSA stuff */
-static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa);
-#endif
-/* This function is aliased to mod_exp (with the mont stuff dropped). */
-static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-
-#ifndef OPENSSL_NO_DH
-/* DH stuff */
-/* This function is alised to mod_exp (with the DH and mont dropped). */
-static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
-        const BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-#endif
-
-/* RAND stuff */
-static int hwcrhk_rand_bytes(unsigned char *buf, int num);
-static int hwcrhk_rand_status(void);
-
-/* KM stuff */
-static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
-static EVP_PKEY *hwcrhk_load_pubkey(ENGINE *eng, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
-static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-        int ind,long argl, void *argp);
-
-/* Interaction stuff */
-static int hwcrhk_insert_card(const char *prompt_info,
-        const char *wrong_info,
-        HWCryptoHook_PassphraseContext *ppctx,
-        HWCryptoHook_CallerContext *cactx);
-static int hwcrhk_get_pass(const char *prompt_info,
-        int *len_io, char *buf,
-        HWCryptoHook_PassphraseContext *ppctx,
-        HWCryptoHook_CallerContext *cactx);
-static void hwcrhk_log_message(void *logstr, const char *message);
-
-/* The definitions for control commands specific to this engine */
-#define HWCRHK_CMD_SO_PATH              ENGINE_CMD_BASE
-#define HWCRHK_CMD_FORK_CHECK           (ENGINE_CMD_BASE + 1)
-#define HWCRHK_CMD_THREAD_LOCKING       (ENGINE_CMD_BASE + 2)
-#define HWCRHK_CMD_SET_USER_INTERFACE   (ENGINE_CMD_BASE + 3)
-#define HWCRHK_CMD_SET_CALLBACK_DATA    (ENGINE_CMD_BASE + 4)
-static const ENGINE_CMD_DEFN hwcrhk_cmd_defns[] = {
-        {HWCRHK_CMD_SO_PATH,
-                "SO_PATH",
-                "Specifies the path to the 'hwcrhk' shared library",
-                ENGINE_CMD_FLAG_STRING},
-        {HWCRHK_CMD_FORK_CHECK,
-                "FORK_CHECK",
-                "Turns fork() checking on or off (boolean)",
-                ENGINE_CMD_FLAG_NUMERIC},
-        {HWCRHK_CMD_THREAD_LOCKING,
-                "THREAD_LOCKING",
-                "Turns thread-safe locking on or off (boolean)",
-                ENGINE_CMD_FLAG_NUMERIC},
-        {HWCRHK_CMD_SET_USER_INTERFACE,
-                "SET_USER_INTERFACE",
-                "Set the global user interface (internal)",
-                ENGINE_CMD_FLAG_INTERNAL},
-        {HWCRHK_CMD_SET_CALLBACK_DATA,
-                "SET_CALLBACK_DATA",
-                "Set the global user interface extra data (internal)",
-                ENGINE_CMD_FLAG_INTERNAL},
-        {0, NULL, NULL, 0}
-        };
-
-#ifndef OPENSSL_NO_RSA
-/* Our internal RSA_METHOD that we provide pointers to */
-static RSA_METHOD hwcrhk_rsa =
-        {
-        "nCipher RSA method",
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        hwcrhk_rsa_mod_exp,
-        hwcrhk_mod_exp_mont,
-        NULL,
-        NULL,
-        0,
-        NULL,
-        NULL,
-        NULL
-        };
-#endif
-
-#ifndef OPENSSL_NO_DH
-/* Our internal DH_METHOD that we provide pointers to */
-static DH_METHOD hwcrhk_dh =
-        {
-        "nCipher DH method",
-        NULL,
-        NULL,
-        hwcrhk_mod_exp_dh,
-        NULL,
-        NULL,
-        0,
-        NULL
-        };
-#endif
-
-static RAND_METHOD hwcrhk_rand =
-        {
-        /* "nCipher RAND method", */
-        NULL,
-        hwcrhk_rand_bytes,
-        NULL,
-        NULL,
-        hwcrhk_rand_bytes,
-        hwcrhk_rand_status,
-        };
-
-/* Constants used when creating the ENGINE */
-static const char *engine_hwcrhk_id = "chil";
-static const char *engine_hwcrhk_name = "nCipher hardware engine support";
-
-/* Internal stuff for HWCryptoHook */
-
-/* Some structures needed for proper use of thread locks */
-/* hwcryptohook.h has some typedefs that turn struct HWCryptoHook_MutexValue
-   into HWCryptoHook_Mutex */
-struct HWCryptoHook_MutexValue
-        {
-        int lockid;
-        };
-
-/* hwcryptohook.h has some typedefs that turn
-   struct HWCryptoHook_PassphraseContextValue
-   into HWCryptoHook_PassphraseContext */
-struct HWCryptoHook_PassphraseContextValue
-        {
-        UI_METHOD *ui_method;
-        void *callback_data;
-        };
-
-/* hwcryptohook.h has some typedefs that turn
-   struct HWCryptoHook_CallerContextValue
-   into HWCryptoHook_CallerContext */
-struct HWCryptoHook_CallerContextValue
-        {
-        pem_password_cb *password_callback; /* Deprecated!  Only present for
-                                               backward compatibility! */
-        UI_METHOD *ui_method;
-        void *callback_data;
-        };
-
-/* The MPI structure in HWCryptoHook is pretty compatible with OpenSSL
-   BIGNUM's, so lets define a couple of conversion macros */
-#define BN2MPI(mp, bn) \
-    {mp.size = bn->top * sizeof(BN_ULONG); mp.buf = (unsigned char *)bn->d;}
-#define MPI2BN(bn, mp) \
-    {mp.size = bn->dmax * sizeof(BN_ULONG); mp.buf = (unsigned char *)bn->d;}
-
-static BIO *logstream = NULL;
-static int disable_mutex_callbacks = 0;
-
-/* One might wonder why these are needed, since one can pass down at least
-   a UI_METHOD and a pointer to callback data to the key-loading functions.
-   The thing is that the ModExp and RSAImmed functions can load keys as well,
-   if the data they get is in a special, nCipher-defined format (hint: if you
-   look at the private exponent of the RSA data as a string, you'll see this
-   string: "nCipher KM tool key id", followed by some bytes, followed a key
-   identity string, followed by more bytes.  This happens when you use "embed"
-   keys instead of "hwcrhk" keys).  Unfortunately, those functions do not take
-   any passphrase or caller context, and our functions can't really take any
-   callback data either.  Still, the "insert_card" and "get_passphrase"
-   callbacks may be called down the line, and will need to know what user
-   interface callbacks to call, and having callback data from the application
-   may be a nice thing as well, so we need to keep track of that globally. */
-static HWCryptoHook_CallerContext password_context = { NULL, NULL, NULL };
-
-/* Stuff to pass to the HWCryptoHook library */
-static HWCryptoHook_InitInfo hwcrhk_globals = {
-        HWCryptoHook_InitFlags_SimpleForkCheck, /* Flags */
-        &logstream,             /* logstream */
-        sizeof(BN_ULONG),       /* limbsize */
-        0,                      /* mslimb first: false for BNs */
-        -1,                     /* msbyte first: use native */
-        0,                      /* Max mutexes, 0 = no small limit */
-        0,                      /* Max simultaneous, 0 = default */
-
-        /* The next few are mutex stuff: we write wrapper functions
-           around the OS mutex functions.  We initialise them to 0
-           here, and change that to actual function pointers in hwcrhk_init()
-           if dynamic locks are supported (that is, if the application
-           programmer has made sure of setting up callbacks bafore starting
-           this engine) *and* if disable_mutex_callbacks hasn't been set by
-           a call to ENGINE_ctrl(ENGINE_CTRL_CHIL_NO_LOCKING). */
-        sizeof(HWCryptoHook_Mutex),
-        0,
-        0,
-        0,
-        0,
-
-        /* The next few are condvar stuff: we write wrapper functions
-           round the OS functions.  Currently not implemented and not
-           and absolute necessity even in threaded programs, therefore
-           0'ed.  Will hopefully be implemented some day, since it
-           enhances the efficiency of HWCryptoHook.  */
-        0, /* sizeof(HWCryptoHook_CondVar), */
-        0, /* hwcrhk_cv_init, */
-        0, /* hwcrhk_cv_wait, */
-        0, /* hwcrhk_cv_signal, */
-        0, /* hwcrhk_cv_broadcast, */
-        0, /* hwcrhk_cv_destroy, */
-
-        hwcrhk_get_pass,        /* pass phrase */
-        hwcrhk_insert_card,     /* insert a card */
-        hwcrhk_log_message      /* Log message */
-};
-
-
-/* Now, to our own code */
-
-/* This internal function is used by ENGINE_ncipher() and possibly by the
- * "dynamic" ENGINE support too */
-static int bind_helper(ENGINE *e)
-        {
-#ifndef OPENSSL_NO_RSA
-        const RSA_METHOD *meth1;
-#endif
-#ifndef OPENSSL_NO_DH
-        const DH_METHOD *meth2;
-#endif
-        if(!ENGINE_set_id(e, engine_hwcrhk_id) ||
-                        !ENGINE_set_name(e, engine_hwcrhk_name) ||
-#ifndef OPENSSL_NO_RSA
-                        !ENGINE_set_RSA(e, &hwcrhk_rsa) ||
-#endif
-#ifndef OPENSSL_NO_DH
-                        !ENGINE_set_DH(e, &hwcrhk_dh) ||
-#endif
-                        !ENGINE_set_RAND(e, &hwcrhk_rand) ||
-                        !ENGINE_set_destroy_function(e, hwcrhk_destroy) ||
-                        !ENGINE_set_init_function(e, hwcrhk_init) ||
-                        !ENGINE_set_finish_function(e, hwcrhk_finish) ||
-                        !ENGINE_set_ctrl_function(e, hwcrhk_ctrl) ||
-                        !ENGINE_set_load_privkey_function(e, hwcrhk_load_privkey) ||
-                        !ENGINE_set_load_pubkey_function(e, hwcrhk_load_pubkey) ||
-                        !ENGINE_set_cmd_defns(e, hwcrhk_cmd_defns))
-                return 0;
-
-#ifndef OPENSSL_NO_RSA
-        /* We know that the "PKCS1_SSLeay()" functions hook properly
-         * to the cswift-specific mod_exp and mod_exp_crt so we use
-         * those functions. NB: We don't use ENGINE_openssl() or
-         * anything "more generic" because something like the RSAref
-         * code may not hook properly, and if you own one of these
-         * cards then you have the right to do RSA operations on it
-         * anyway! */ 
-        meth1 = RSA_PKCS1_SSLeay();
-        hwcrhk_rsa.rsa_pub_enc = meth1->rsa_pub_enc;
-        hwcrhk_rsa.rsa_pub_dec = meth1->rsa_pub_dec;
-        hwcrhk_rsa.rsa_priv_enc = meth1->rsa_priv_enc;
-        hwcrhk_rsa.rsa_priv_dec = meth1->rsa_priv_dec;
-#endif
-
-#ifndef OPENSSL_NO_DH
-        /* Much the same for Diffie-Hellman */
-        meth2 = DH_OpenSSL();
-        hwcrhk_dh.generate_key = meth2->generate_key;
-        hwcrhk_dh.compute_key = meth2->compute_key;
-#endif
-
-        /* Ensure the hwcrhk error handling is set up */
-        ERR_load_HWCRHK_strings();
-        return 1;
-        }
-
-#ifndef ENGINE_DYNAMIC_SUPPORT
-static ENGINE *engine_ncipher(void)
-        {
-        ENGINE *ret = ENGINE_new();
-        if(!ret)
-                return NULL;
-        if(!bind_helper(ret))
-                {
-                ENGINE_free(ret);
-                return NULL;
-                }
-        return ret;
-        }
-
-void ENGINE_load_chil(void)
-        {
-        /* Copied from eng_[openssl|dyn].c */
-        ENGINE *toadd = engine_ncipher();
-        if(!toadd) return;
-        ENGINE_add(toadd);
-        ENGINE_free(toadd);
-        ERR_clear_error();
-        }
-#endif
-
-/* This is a process-global DSO handle used for loading and unloading
- * the HWCryptoHook library. NB: This is only set (or unset) during an
- * init() or finish() call (reference counts permitting) and they're
- * operating with global locks, so this should be thread-safe
- * implicitly. */
-static DSO *hwcrhk_dso = NULL;
-static HWCryptoHook_ContextHandle hwcrhk_context = 0;
-#ifndef OPENSSL_NO_RSA
-static int hndidx_rsa = -1;    /* Index for KM handle.  Not really used yet. */
-#endif
-
-/* These are the function pointers that are (un)set when the library has
- * successfully (un)loaded. */
-static HWCryptoHook_Init_t *p_hwcrhk_Init = NULL;
-static HWCryptoHook_Finish_t *p_hwcrhk_Finish = NULL;
-static HWCryptoHook_ModExp_t *p_hwcrhk_ModExp = NULL;
-#ifndef OPENSSL_NO_RSA
-static HWCryptoHook_RSA_t *p_hwcrhk_RSA = NULL;
-#endif
-static HWCryptoHook_RandomBytes_t *p_hwcrhk_RandomBytes = NULL;
-#ifndef OPENSSL_NO_RSA
-static HWCryptoHook_RSALoadKey_t *p_hwcrhk_RSALoadKey = NULL;
-static HWCryptoHook_RSAGetPublicKey_t *p_hwcrhk_RSAGetPublicKey = NULL;
-static HWCryptoHook_RSAUnloadKey_t *p_hwcrhk_RSAUnloadKey = NULL;
-#endif
-static HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL;
-
-/* Used in the DSO operations. */
-static const char *HWCRHK_LIBNAME = NULL;
-static void free_HWCRHK_LIBNAME(void)
-        {
-        if(HWCRHK_LIBNAME)
-                OPENSSL_free((void*)HWCRHK_LIBNAME);
-        HWCRHK_LIBNAME = NULL;
-        }
-static const char *get_HWCRHK_LIBNAME(void)
-        {
-        if(HWCRHK_LIBNAME)
-                return HWCRHK_LIBNAME;
-        return "nfhwcrhk";
-        }
-static long set_HWCRHK_LIBNAME(const char *name)
-        {
-        free_HWCRHK_LIBNAME();
-        return (((HWCRHK_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
-        }
-static const char *n_hwcrhk_Init = "HWCryptoHook_Init";
-static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish";
-static const char *n_hwcrhk_ModExp = "HWCryptoHook_ModExp";
-#ifndef OPENSSL_NO_RSA
-static const char *n_hwcrhk_RSA = "HWCryptoHook_RSA";
-#endif
-static const char *n_hwcrhk_RandomBytes = "HWCryptoHook_RandomBytes";
-#ifndef OPENSSL_NO_RSA
-static const char *n_hwcrhk_RSALoadKey = "HWCryptoHook_RSALoadKey";
-static const char *n_hwcrhk_RSAGetPublicKey = "HWCryptoHook_RSAGetPublicKey";
-static const char *n_hwcrhk_RSAUnloadKey = "HWCryptoHook_RSAUnloadKey";
-#endif
-static const char *n_hwcrhk_ModExpCRT = "HWCryptoHook_ModExpCRT";
-
-/* HWCryptoHook library functions and mechanics - these are used by the
- * higher-level functions further down. NB: As and where there's no
- * error checking, take a look lower down where these functions are
- * called, the checking and error handling is probably down there. */
-
-/* utility function to obtain a context */
-static int get_context(HWCryptoHook_ContextHandle *hac,
-        HWCryptoHook_CallerContext *cac)
-        {
-        char tempbuf[1024];
-        HWCryptoHook_ErrMsgBuf rmsg;
-
-        rmsg.buf = tempbuf;
-        rmsg.size = sizeof(tempbuf);
-
-        *hac = p_hwcrhk_Init(&hwcrhk_globals, sizeof(hwcrhk_globals), &rmsg,
-                cac);
-        if (!*hac)
-                return 0;
-        return 1;
-        }
- 
-/* similarly to release one. */
-static void release_context(HWCryptoHook_ContextHandle hac)
-        {
-        p_hwcrhk_Finish(hac);
-        }
-
-/* Destructor (complements the "ENGINE_ncipher()" constructor) */
-static int hwcrhk_destroy(ENGINE *e)
-        {
-        free_HWCRHK_LIBNAME();
-        ERR_unload_HWCRHK_strings();
-        return 1;
-        }
-
-/* (de)initialisation functions. */
-static int hwcrhk_init(ENGINE *e)
-        {
-        HWCryptoHook_Init_t *p1;
-        HWCryptoHook_Finish_t *p2;
-        HWCryptoHook_ModExp_t *p3;
-#ifndef OPENSSL_NO_RSA
-        HWCryptoHook_RSA_t *p4;
-        HWCryptoHook_RSALoadKey_t *p5;
-        HWCryptoHook_RSAGetPublicKey_t *p6;
-        HWCryptoHook_RSAUnloadKey_t *p7;
-#endif
-        HWCryptoHook_RandomBytes_t *p8;
-        HWCryptoHook_ModExpCRT_t *p9;
-
-        if(hwcrhk_dso != NULL)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_ALREADY_LOADED);
-                goto err;
-                }
-        /* Attempt to load libnfhwcrhk.so/nfhwcrhk.dll/whatever. */
-        hwcrhk_dso = DSO_load(NULL, get_HWCRHK_LIBNAME(), NULL, 0);
-        if(hwcrhk_dso == NULL)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DSO_FAILURE);
-                goto err;
-                }
-        if(!(p1 = (HWCryptoHook_Init_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_Init)) ||
-                !(p2 = (HWCryptoHook_Finish_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_Finish)) ||
-                !(p3 = (HWCryptoHook_ModExp_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_ModExp)) ||
-#ifndef OPENSSL_NO_RSA
-                !(p4 = (HWCryptoHook_RSA_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_RSA)) ||
-                !(p5 = (HWCryptoHook_RSALoadKey_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_RSALoadKey)) ||
-                !(p6 = (HWCryptoHook_RSAGetPublicKey_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_RSAGetPublicKey)) ||
-                !(p7 = (HWCryptoHook_RSAUnloadKey_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_RSAUnloadKey)) ||
-#endif
-                !(p8 = (HWCryptoHook_RandomBytes_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_RandomBytes)) ||
-                !(p9 = (HWCryptoHook_ModExpCRT_t *)
-                        DSO_bind_func(hwcrhk_dso, n_hwcrhk_ModExpCRT)))
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DSO_FAILURE);
-                goto err;
-                }
-        /* Copy the pointers */
-        p_hwcrhk_Init = p1;
-        p_hwcrhk_Finish = p2;
-        p_hwcrhk_ModExp = p3;
-#ifndef OPENSSL_NO_RSA
-        p_hwcrhk_RSA = p4;
-        p_hwcrhk_RSALoadKey = p5;
-        p_hwcrhk_RSAGetPublicKey = p6;
-        p_hwcrhk_RSAUnloadKey = p7;
-#endif
-        p_hwcrhk_RandomBytes = p8;
-        p_hwcrhk_ModExpCRT = p9;
-
-        /* Check if the application decided to support dynamic locks,
-           and if it does, use them. */
-        if (disable_mutex_callbacks == 0)
-                {
-                if (CRYPTO_get_dynlock_create_callback() != NULL &&
-                        CRYPTO_get_dynlock_lock_callback() != NULL &&
-                        CRYPTO_get_dynlock_destroy_callback() != NULL)
-                        {
-                        hwcrhk_globals.mutex_init = hwcrhk_mutex_init;
-                        hwcrhk_globals.mutex_acquire = hwcrhk_mutex_lock;
-                        hwcrhk_globals.mutex_release = hwcrhk_mutex_unlock;
-                        hwcrhk_globals.mutex_destroy = hwcrhk_mutex_destroy;
-                        }
-                else if (CRYPTO_get_locking_callback() != NULL)
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DYNAMIC_LOCKING_MISSING);
-                        ERR_add_error_data(1,"You HAVE to add dynamic locking callbacks via CRYPTO_set_dynlock_{create,lock,destroy}_callback()");
-#if 1 /* This is a HACK which will disappear in 0.9.8 */
-                        hwcrhk_globals.maxmutexes    = 1; /* Only have one lock */
-                        hwcrhk_globals.mutex_init    = hwcrhk_static_mutex_init;
-                        hwcrhk_globals.mutex_acquire = hwcrhk_static_mutex_lock;
-                        hwcrhk_globals.mutex_release = hwcrhk_static_mutex_unlock;
-                        hwcrhk_globals.mutex_destroy = hwcrhk_static_mutex_destroy;
-#else
-                        goto err;
-#endif
-                        }
-                }
-
-        /* Try and get a context - if not, we may have a DSO but no
-         * accelerator! */
-        if(!get_context(&hwcrhk_context, &password_context))
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_UNIT_FAILURE);
-                goto err;
-                }
-        /* Everything's fine. */
-#ifndef OPENSSL_NO_RSA
-        if (hndidx_rsa == -1)
-                hndidx_rsa = RSA_get_ex_new_index(0,
-                        "nFast HWCryptoHook RSA key handle",
-                        NULL, NULL, hwcrhk_ex_free);
-#endif
-        return 1;
-err:
-        if(hwcrhk_dso)
-                DSO_free(hwcrhk_dso);
-        hwcrhk_dso = NULL;
-        p_hwcrhk_Init = NULL;
-        p_hwcrhk_Finish = NULL;
-        p_hwcrhk_ModExp = NULL;
-#ifndef OPENSSL_NO_RSA
-        p_hwcrhk_RSA = NULL;
-        p_hwcrhk_RSALoadKey = NULL;
-        p_hwcrhk_RSAGetPublicKey = NULL;
-        p_hwcrhk_RSAUnloadKey = NULL;
-#endif
-        p_hwcrhk_ModExpCRT = NULL;
-        p_hwcrhk_RandomBytes = NULL;
-        return 0;
-        }
-
-static int hwcrhk_finish(ENGINE *e)
-        {
-        int to_return = 1;
-        free_HWCRHK_LIBNAME();
-        if(hwcrhk_dso == NULL)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_FINISH,HWCRHK_R_NOT_LOADED);
-                to_return = 0;
-                goto err;
-                }
-        release_context(hwcrhk_context);
-        if(!DSO_free(hwcrhk_dso))
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_FINISH,HWCRHK_R_DSO_FAILURE);
-                to_return = 0;
-                goto err;
-                }
- err:
-        if (logstream)
-                BIO_free(logstream);
-        hwcrhk_dso = NULL;
-        p_hwcrhk_Init = NULL;
-        p_hwcrhk_Finish = NULL;
-        p_hwcrhk_ModExp = NULL;
-#ifndef OPENSSL_NO_RSA
-        p_hwcrhk_RSA = NULL;
-        p_hwcrhk_RSALoadKey = NULL;
-        p_hwcrhk_RSAGetPublicKey = NULL;
-        p_hwcrhk_RSAUnloadKey = NULL;
-#endif
-        p_hwcrhk_ModExpCRT = NULL;
-        p_hwcrhk_RandomBytes = NULL;
-        return to_return;
-        }
-
-static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-        {
-        int to_return = 1;
-
-        switch(cmd)
-                {
-        case HWCRHK_CMD_SO_PATH:
-                if(hwcrhk_dso)
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,HWCRHK_R_ALREADY_LOADED);
-                        return 0;
-                        }
-                if(p == NULL)
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,ERR_R_PASSED_NULL_PARAMETER);
-                        return 0;
-                        }
-                return set_HWCRHK_LIBNAME((const char *)p);
-        case ENGINE_CTRL_SET_LOGSTREAM:
-                {
-                BIO *bio = (BIO *)p;
-
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                if (logstream)
-                        {
-                        BIO_free(logstream);
-                        logstream = NULL;
-                        }
-                if (CRYPTO_add(&bio->references,1,CRYPTO_LOCK_BIO) > 1)
-                        logstream = bio;
-                else
-                        HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,HWCRHK_R_BIO_WAS_FREED);
-                }
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-        case ENGINE_CTRL_SET_PASSWORD_CALLBACK:
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                password_context.password_callback = (pem_password_cb *)f;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-        case ENGINE_CTRL_SET_USER_INTERFACE:
-        case HWCRHK_CMD_SET_USER_INTERFACE:
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                password_context.ui_method = (UI_METHOD *)p;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-        case ENGINE_CTRL_SET_CALLBACK_DATA:
-        case HWCRHK_CMD_SET_CALLBACK_DATA:
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                password_context.callback_data = p;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-        /* this enables or disables the "SimpleForkCheck" flag used in the
-         * initialisation structure. */
-        case ENGINE_CTRL_CHIL_SET_FORKCHECK:
-        case HWCRHK_CMD_FORK_CHECK:
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                if(i)
-                        hwcrhk_globals.flags |=
-                                HWCryptoHook_InitFlags_SimpleForkCheck;
-                else
-                        hwcrhk_globals.flags &=
-                                ~HWCryptoHook_InitFlags_SimpleForkCheck;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-        /* This will prevent the initialisation function from "installing"
-         * the mutex-handling callbacks, even if they are available from
-         * within the library (or were provided to the library from the
-         * calling application). This is to remove any baggage for
-         * applications not using multithreading. */
-        case ENGINE_CTRL_CHIL_NO_LOCKING:
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                disable_mutex_callbacks = 1;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-        case HWCRHK_CMD_THREAD_LOCKING:
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                disable_mutex_callbacks = ((i == 0) ? 0 : 1);
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-
-        /* The command isn't understood by this engine */
-        default:
-                HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,
-                        HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED);
-                to_return = 0;
-                break;
-                }
-
-        return to_return;
-        }
-
-static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data)
-        {
-#ifndef OPENSSL_NO_RSA
-        RSA *rtmp = NULL;
-#endif
-        EVP_PKEY *res = NULL;
-#ifndef OPENSSL_NO_RSA
-        HWCryptoHook_MPI e, n;
-        HWCryptoHook_RSAKeyHandle *hptr;
-#endif
-#if !defined(OPENSSL_NO_RSA)
-        char tempbuf[1024];
-        HWCryptoHook_ErrMsgBuf rmsg;
-#endif
-        HWCryptoHook_PassphraseContext ppctx;
-
-#if !defined(OPENSSL_NO_RSA)
-        rmsg.buf = tempbuf;
-        rmsg.size = sizeof(tempbuf);
-#endif
-
-        if(!hwcrhk_context)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,
-                        HWCRHK_R_NOT_INITIALISED);
-                goto err;
-                }
-#ifndef OPENSSL_NO_RSA
-        hptr = OPENSSL_malloc(sizeof(HWCryptoHook_RSAKeyHandle));
-        if (!hptr)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,
-                        ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-        ppctx.ui_method = ui_method;
-        ppctx.callback_data = callback_data;
-        if (p_hwcrhk_RSALoadKey(hwcrhk_context, key_id, hptr,
-                &rmsg, &ppctx))
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,
-                        HWCRHK_R_CHIL_ERROR);
-                ERR_add_error_data(1,rmsg.buf);
-                goto err;
-                }
-        if (!*hptr)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,
-                        HWCRHK_R_NO_KEY);
-                goto err;
-                }
-#endif
-#ifndef OPENSSL_NO_RSA
-        rtmp = RSA_new_method(eng);
-        RSA_set_ex_data(rtmp, hndidx_rsa, (char *)hptr);
-        rtmp->e = BN_new();
-        rtmp->n = BN_new();
-        rtmp->flags |= RSA_FLAG_EXT_PKEY;
-        MPI2BN(rtmp->e, e);
-        MPI2BN(rtmp->n, n);
-        if (p_hwcrhk_RSAGetPublicKey(*hptr, &n, &e, &rmsg)
-                != HWCRYPTOHOOK_ERROR_MPISIZE)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PUBKEY,HWCRHK_R_CHIL_ERROR);
-                ERR_add_error_data(1,rmsg.buf);
-                goto err;
-                }
-
-        bn_expand2(rtmp->e, e.size/sizeof(BN_ULONG));
-        bn_expand2(rtmp->n, n.size/sizeof(BN_ULONG));
-        MPI2BN(rtmp->e, e);
-        MPI2BN(rtmp->n, n);
-
-        if (p_hwcrhk_RSAGetPublicKey(*hptr, &n, &e, &rmsg))
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PUBKEY,
-                        HWCRHK_R_CHIL_ERROR);
-                ERR_add_error_data(1,rmsg.buf);
-                goto err;
-                }
-        rtmp->e->top = e.size / sizeof(BN_ULONG);
-        bn_fix_top(rtmp->e);
-        rtmp->n->top = n.size / sizeof(BN_ULONG);
-        bn_fix_top(rtmp->n);
-
-        res = EVP_PKEY_new();
-        EVP_PKEY_assign_RSA(res, rtmp);
-#endif
-
-        if (!res)
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PUBKEY,
-                        HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED);
-
-        return res;
- err:
-        if (res)
-                EVP_PKEY_free(res);
-#ifndef OPENSSL_NO_RSA
-        if (rtmp)
-                RSA_free(rtmp);
-#endif
-        return NULL;
-        }
-
-static EVP_PKEY *hwcrhk_load_pubkey(ENGINE *eng, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data)
-        {
-        EVP_PKEY *res = NULL;
-
-#ifndef OPENSSL_NO_RSA
-        res = hwcrhk_load_privkey(eng, key_id,
-                ui_method, callback_data);
-#endif
-
-        if (res)
-                switch(res->type)
-                        {
-#ifndef OPENSSL_NO_RSA
-                case EVP_PKEY_RSA:
-                        {
-                        RSA *rsa = NULL;
-
-                        CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY);
-                        rsa = res->pkey.rsa;
-                        res->pkey.rsa = RSA_new();
-                        res->pkey.rsa->n = rsa->n;
-                        res->pkey.rsa->e = rsa->e;
-                        rsa->n = NULL;
-                        rsa->e = NULL;
-                        CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY);
-                        RSA_free(rsa);
-                        }
-                        break;
-#endif
-                default:
-                        HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PUBKEY,
-                                HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED);
-                        goto err;
-                        }
-
-        return res;
- err:
-        if (res)
-                EVP_PKEY_free(res);
-        return NULL;
-        }
-
-/* A little mod_exp */
-static int hwcrhk_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *m, BN_CTX *ctx)
-        {
-        char tempbuf[1024];
-        HWCryptoHook_ErrMsgBuf rmsg;
-        /* Since HWCryptoHook_MPI is pretty compatible with BIGNUM's,
-           we use them directly, plus a little macro magic.  We only
-           thing we need to make sure of is that enough space is allocated. */
-        HWCryptoHook_MPI m_a, m_p, m_n, m_r;
-        int to_return, ret;
- 
-        to_return = 0; /* expect failure */
-        rmsg.buf = tempbuf;
-        rmsg.size = sizeof(tempbuf);
-
-        if(!hwcrhk_context)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_MOD_EXP,HWCRHK_R_NOT_INITIALISED);
-                goto err;
-                }
-        /* Prepare the params */
-        bn_expand2(r, m->top);  /* Check for error !! */
-        BN2MPI(m_a, a);
-        BN2MPI(m_p, p);
-        BN2MPI(m_n, m);
-        MPI2BN(r, m_r);
-
-        /* Perform the operation */
-        ret = p_hwcrhk_ModExp(hwcrhk_context, m_a, m_p, m_n, &m_r, &rmsg);
-
-        /* Convert the response */
-        r->top = m_r.size / sizeof(BN_ULONG);
-        bn_fix_top(r);
-
-        if (ret < 0)
-                {
-                /* FIXME: When this error is returned, HWCryptoHook is
-                   telling us that falling back to software computation
-                   might be a good thing. */
-                if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_MOD_EXP,HWCRHK_R_REQUEST_FALLBACK);
-                        }
-                else
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_MOD_EXP,HWCRHK_R_REQUEST_FAILED);
-                        }
-                ERR_add_error_data(1,rmsg.buf);
-                goto err;
-                }
-
-        to_return = 1;
-err:
-        return to_return;
-        }
-
-#ifndef OPENSSL_NO_RSA 
-static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa)
-        {
-        char tempbuf[1024];
-        HWCryptoHook_ErrMsgBuf rmsg;
-        HWCryptoHook_RSAKeyHandle *hptr;
-        int to_return = 0, ret;
-
-        rmsg.buf = tempbuf;
-        rmsg.size = sizeof(tempbuf);
-
-        if(!hwcrhk_context)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_MOD_EXP,HWCRHK_R_NOT_INITIALISED);
-                goto err;
-                }
-
-        /* This provides support for nForce keys.  Since that's opaque data
-           all we do is provide a handle to the proper key and let HWCryptoHook
-           take care of the rest. */
-        if ((hptr = (HWCryptoHook_RSAKeyHandle *) RSA_get_ex_data(rsa, hndidx_rsa))
-                != NULL)
-                {
-                HWCryptoHook_MPI m_a, m_r;
-
-                if(!rsa->n)
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_RSA_MOD_EXP,
-                                HWCRHK_R_MISSING_KEY_COMPONENTS);
-                        goto err;
-                        }
-
-                /* Prepare the params */
-                bn_expand2(r, rsa->n->top); /* Check for error !! */
-                BN2MPI(m_a, I);
-                MPI2BN(r, m_r);
-
-                /* Perform the operation */
-                ret = p_hwcrhk_RSA(m_a, *hptr, &m_r, &rmsg);
-
-                /* Convert the response */
-                r->top = m_r.size / sizeof(BN_ULONG);
-                bn_fix_top(r);
-
-                if (ret < 0)
-                        {
-                        /* FIXME: When this error is returned, HWCryptoHook is
-                           telling us that falling back to software computation
-                           might be a good thing. */
-                        if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
-                                {
-                                HWCRHKerr(HWCRHK_F_HWCRHK_RSA_MOD_EXP,
-                                        HWCRHK_R_REQUEST_FALLBACK);
-                                }
-                        else
-                                {
-                                HWCRHKerr(HWCRHK_F_HWCRHK_RSA_MOD_EXP,
-                                        HWCRHK_R_REQUEST_FAILED);
-                                }
-                        ERR_add_error_data(1,rmsg.buf);
-                        goto err;
-                        }
-                }
-        else
-                {
-                HWCryptoHook_MPI m_a, m_p, m_q, m_dmp1, m_dmq1, m_iqmp, m_r;
-
-                if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_RSA_MOD_EXP,
-                                HWCRHK_R_MISSING_KEY_COMPONENTS);
-                        goto err;
-                        }
-
-                /* Prepare the params */
-                bn_expand2(r, rsa->n->top); /* Check for error !! */
-                BN2MPI(m_a, I);
-                BN2MPI(m_p, rsa->p);
-                BN2MPI(m_q, rsa->q);
-                BN2MPI(m_dmp1, rsa->dmp1);
-                BN2MPI(m_dmq1, rsa->dmq1);
-                BN2MPI(m_iqmp, rsa->iqmp);
-                MPI2BN(r, m_r);
-
-                /* Perform the operation */
-                ret = p_hwcrhk_ModExpCRT(hwcrhk_context, m_a, m_p, m_q,
-                        m_dmp1, m_dmq1, m_iqmp, &m_r, &rmsg);
-
-                /* Convert the response */
-                r->top = m_r.size / sizeof(BN_ULONG);
-                bn_fix_top(r);
-
-                if (ret < 0)
-                        {
-                        /* FIXME: When this error is returned, HWCryptoHook is
-                           telling us that falling back to software computation
-                           might be a good thing. */
-                        if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
-                                {
-                                HWCRHKerr(HWCRHK_F_HWCRHK_RSA_MOD_EXP,
-                                        HWCRHK_R_REQUEST_FALLBACK);
-                                }
-                        else
-                                {
-                                HWCRHKerr(HWCRHK_F_HWCRHK_RSA_MOD_EXP,
-                                        HWCRHK_R_REQUEST_FAILED);
-                                }
-                        ERR_add_error_data(1,rmsg.buf);
-                        goto err;
-                        }
-                }
-        /* If we're here, we must be here with some semblance of success :-) */
-        to_return = 1;
-err:
-        return to_return;
-        }
-#endif
-
-/* This function is aliased to mod_exp (with the mont stuff dropped). */
-static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-        {
-        return hwcrhk_mod_exp(r, a, p, m, ctx);
-        }
-
-#ifndef OPENSSL_NO_DH
-/* This function is aliased to mod_exp (with the dh and mont dropped). */
-static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
-                const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-        {
-        return hwcrhk_mod_exp(r, a, p, m, ctx);
-        }
-#endif
-
-/* Random bytes are good */
-static int hwcrhk_rand_bytes(unsigned char *buf, int num)
-        {
-        char tempbuf[1024];
-        HWCryptoHook_ErrMsgBuf rmsg;
-        int to_return = 0; /* assume failure */
-        int ret;
-
-        rmsg.buf = tempbuf;
-        rmsg.size = sizeof(tempbuf);
-
-        if(!hwcrhk_context)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_RAND_BYTES,HWCRHK_R_NOT_INITIALISED);
-                goto err;
-                }
-
-        ret = p_hwcrhk_RandomBytes(hwcrhk_context, buf, num, &rmsg);
-        if (ret < 0)
-                {
-                /* FIXME: When this error is returned, HWCryptoHook is
-                   telling us that falling back to software computation
-                   might be a good thing. */
-                if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_RAND_BYTES,
-                                HWCRHK_R_REQUEST_FALLBACK);
-                        }
-                else
-                        {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_RAND_BYTES,
-                                HWCRHK_R_REQUEST_FAILED);
-                        }
-                ERR_add_error_data(1,rmsg.buf);
-                goto err;
-                }
-        to_return = 1;
- err:
-        return to_return;
-        }
-
-static int hwcrhk_rand_status(void)
-        {
-        return 1;
-        }
-
-/* This cleans up an RSA KM key, called when ex_data is freed */
-
-static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-        int ind,long argl, void *argp)
-{
-        char tempbuf[1024];
-        HWCryptoHook_ErrMsgBuf rmsg;
-#ifndef OPENSSL_NO_RSA
-        HWCryptoHook_RSAKeyHandle *hptr;
-#endif
-#if !defined(OPENSSL_NO_RSA)
-        int ret;
-#endif
-
-        rmsg.buf = tempbuf;
-        rmsg.size = sizeof(tempbuf);
-
-#ifndef OPENSSL_NO_RSA
-        hptr = (HWCryptoHook_RSAKeyHandle *) item;
-        if(hptr)
-                {
-                ret = p_hwcrhk_RSAUnloadKey(*hptr, NULL);
-                OPENSSL_free(hptr);
-                }
-#endif
-}
-
-/* Mutex calls: since the HWCryptoHook model closely follows the POSIX model
- * these just wrap the POSIX functions and add some logging.
- */
-
-static int hwcrhk_mutex_init(HWCryptoHook_Mutex* mt,
-        HWCryptoHook_CallerContext *cactx)
-        {
-        mt->lockid = CRYPTO_get_new_dynlockid();
-        if (mt->lockid == 0)
-                return 1; /* failure */
-        return 0; /* success */
-        }
-
-static int hwcrhk_mutex_lock(HWCryptoHook_Mutex *mt)
-        {
-        CRYPTO_w_lock(mt->lockid);
-        return 0;
-        }
-
-static void hwcrhk_mutex_unlock(HWCryptoHook_Mutex * mt)
-        {
-        CRYPTO_w_unlock(mt->lockid);
-        }
-
-static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex *mt)
-        {
-        CRYPTO_destroy_dynlockid(mt->lockid);
-        }
-
-/* Mutex upcalls to use if the application does not support dynamic locks */
-
-static int hwcrhk_static_mutex_init(HWCryptoHook_Mutex *m,
-        HWCryptoHook_CallerContext *c)
-        {
-        return 0;
-        }
-static int hwcrhk_static_mutex_lock(HWCryptoHook_Mutex *m)
-        {
-        CRYPTO_w_lock(CRYPTO_LOCK_HWCRHK);
-        return 0;
-        }
-static void hwcrhk_static_mutex_unlock(HWCryptoHook_Mutex *m)
-        {
-        CRYPTO_w_unlock(CRYPTO_LOCK_HWCRHK);
-        }
-static void hwcrhk_static_mutex_destroy(HWCryptoHook_Mutex *m)
-        {
-        }
-
-static int hwcrhk_get_pass(const char *prompt_info,
-        int *len_io, char *buf,
-        HWCryptoHook_PassphraseContext *ppctx,
-        HWCryptoHook_CallerContext *cactx)
-        {
-        pem_password_cb *callback = NULL;
-        void *callback_data = NULL;
-        UI_METHOD *ui_method = NULL;
-
-        if (cactx)
-                {
-                if (cactx->ui_method)
-                        ui_method = cactx->ui_method;
-                if (cactx->password_callback)
-                        callback = cactx->password_callback;
-                if (cactx->callback_data)
-                        callback_data = cactx->callback_data;
-                }
-        if (ppctx)
-                {
-                if (ppctx->ui_method)
-                        {
-                        ui_method = ppctx->ui_method;
-                        callback = NULL;
-                        }
-                if (ppctx->callback_data)
-                        callback_data = ppctx->callback_data;
-                }
-        if (callback == NULL && ui_method == NULL)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_GET_PASS,HWCRHK_R_NO_CALLBACK);
-                return -1;
-                }
-
-        if (ui_method)
-                {
-                UI *ui = UI_new_method(ui_method);
-                if (ui)
-                        {
-                        int ok;
-                        char *prompt = UI_construct_prompt(ui,
-                                "pass phrase", prompt_info);
-
-                        ok = UI_add_input_string(ui,prompt,
-                                UI_INPUT_FLAG_DEFAULT_PWD,
-                                buf,0,(*len_io) - 1);
-                        UI_add_user_data(ui, callback_data);
-                        UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
-
-                        if (ok >= 0)
-                                do
-                                        {
-                                        ok=UI_process(ui);
-                                        }
-                                while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
-
-                        if (ok >= 0)
-                                *len_io = strlen(buf);
-
-                        UI_free(ui);
-                        OPENSSL_free(prompt);
-                        }
-                }
-        else
-                {
-                *len_io = callback(buf, *len_io, 0, callback_data);
-                }
-        if(!*len_io)
-                return -1;
-        return 0;
-        }
-
-static int hwcrhk_insert_card(const char *prompt_info,
-                      const char *wrong_info,
-                      HWCryptoHook_PassphraseContext *ppctx,
-                      HWCryptoHook_CallerContext *cactx)
-        {
-        int ok = -1;
-        UI *ui;
-        void *callback_data = NULL;
-        UI_METHOD *ui_method = NULL;
-
-        if (cactx)
-                {
-                if (cactx->ui_method)
-                        ui_method = cactx->ui_method;
-                if (cactx->callback_data)
-                        callback_data = cactx->callback_data;
-                }
-        if (ppctx)
-                {
-                if (ppctx->ui_method)
-                        ui_method = ppctx->ui_method;
-                if (ppctx->callback_data)
-                        callback_data = ppctx->callback_data;
-                }
-        if (ui_method == NULL)
-                {
-                HWCRHKerr(HWCRHK_F_HWCRHK_INSERT_CARD,
-                        HWCRHK_R_NO_CALLBACK);
-                return -1;
-                }
-
-        ui = UI_new_method(ui_method);
-
-        if (ui)
-                {
-                char answer;
-                char buf[BUFSIZ];
-
-                if (wrong_info)
-                        BIO_snprintf(buf, sizeof(buf)-1,
-                                "Current card: \"%s\"\n", wrong_info);
-                ok = UI_dup_info_string(ui, buf);
-                if (ok >= 0 && prompt_info)
-                        {
-                        BIO_snprintf(buf, sizeof(buf)-1,
-                                "Insert card \"%s\"", prompt_info);
-                        ok = UI_dup_input_boolean(ui, buf,
-                                "\n then hit <enter> or C<enter> to cancel\n",
-                                "\r\n", "Cc", UI_INPUT_FLAG_ECHO, &answer);
-                        }
-                UI_add_user_data(ui, callback_data);
-
-                if (ok >= 0)
-                        ok = UI_process(ui);
-                UI_free(ui);
-
-                if (ok == -2 || (ok >= 0 && answer == 'C'))
-                        ok = 1;
-                else if (ok < 0)
-                        ok = -1;
-                else
-                        ok = 0;
-                }
-        return ok;
-        }
-
-static void hwcrhk_log_message(void *logstr, const char *message)
-        {
-        BIO *lstream = NULL;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_BIO);
-        if (logstr)
-                lstream=*(BIO **)logstr;
-        if (lstream)
-                {
-                BIO_printf(lstream, "%s\n", message);
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_BIO);
-        }
-
-/* This stuff is needed if this ENGINE is being compiled into a self-contained
- * shared-library. */      
-#ifdef ENGINE_DYNAMIC_SUPPORT
-static int bind_fn(ENGINE *e, const char *id)
-        {
-        if(id && (strcmp(id, engine_hwcrhk_id) != 0))
-                return 0;
-        if(!bind_helper(e))
-                return 0;
-        return 1;
-        }       
-IMPLEMENT_DYNAMIC_CHECK_FN()
-IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
-
-#endif /* !OPENSSL_NO_HW_NCIPHER */
-#endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/hw_ncipher_err.h b/src/lib/libcrypto/engine/hw_ncipher_err.h
deleted file mode 100644
index d232d02319..0000000000
--- a/src/lib/libcrypto/engine/hw_ncipher_err.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_HWCRHK_ERR_H
-#define HEADER_HWCRHK_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_HWCRHK_strings(void);
-static void ERR_unload_HWCRHK_strings(void);
-static void ERR_HWCRHK_error(int function, int reason, char *file, int line);
-#define HWCRHKerr(f,r) ERR_HWCRHK_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the HWCRHK functions. */
-
-/* Function codes. */
-#define HWCRHK_F_HWCRHK_CTRL                             100
-#define HWCRHK_F_HWCRHK_FINISH                           101
-#define HWCRHK_F_HWCRHK_GET_PASS                         102
-#define HWCRHK_F_HWCRHK_INIT                             103
-#define HWCRHK_F_HWCRHK_INSERT_CARD                      104
-#define HWCRHK_F_HWCRHK_LOAD_PRIVKEY                     105
-#define HWCRHK_F_HWCRHK_LOAD_PUBKEY                      106
-#define HWCRHK_F_HWCRHK_MOD_EXP                          107
-#define HWCRHK_F_HWCRHK_RAND_BYTES                       108
-#define HWCRHK_F_HWCRHK_RSA_MOD_EXP                      109
-
-/* Reason codes. */
-#define HWCRHK_R_ALREADY_LOADED                          100
-#define HWCRHK_R_BIO_WAS_FREED                           101
-#define HWCRHK_R_CHIL_ERROR                              102
-#define HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED            103
-#define HWCRHK_R_DSO_FAILURE                             104
-#define HWCRHK_R_DYNAMIC_LOCKING_MISSING                 114
-#define HWCRHK_R_MISSING_KEY_COMPONENTS                  105
-#define HWCRHK_R_NOT_INITIALISED                         106
-#define HWCRHK_R_NOT_LOADED                              107
-#define HWCRHK_R_NO_CALLBACK                             108
-#define HWCRHK_R_NO_KEY                                  109
-#define HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED         110
-#define HWCRHK_R_REQUEST_FAILED                          111
-#define HWCRHK_R_REQUEST_FALLBACK                        112
-#define HWCRHK_R_UNIT_FAILURE                            113
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/src/lib/libcrypto/engine/hw_sureware.c b/src/lib/libcrypto/engine/hw_sureware.c
deleted file mode 100644
index fca467e690..0000000000
--- a/src/lib/libcrypto/engine/hw_sureware.c
+++ /dev/null
@@ -1,1039 +0,0 @@
-/* Written by Corinne Dive-Reclus(cdive@baltimore.com)
-* 
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer. 
-*
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in
-*    the documentation and/or other materials provided with the
-*    distribution.
-*
-* 3. All advertising materials mentioning features or use of this
-*    software must display the following acknowledgment:
-*    "This product includes software developed by the OpenSSL Project
-*    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
-*
-* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
-*    endorse or promote products derived from this software without
-*    prior written permission. For written permission, please contact
-*    licensing@OpenSSL.org.
-*
-* 5. Products derived from this software may not be called "OpenSSL"
-*    nor may "OpenSSL" appear in their names without prior written
-*    permission of the OpenSSL Project.
-*
-* 6. Redistributions of any form whatsoever must retain the following
-*    acknowledgment:
-*    "This product includes software developed by the OpenSSL Project
-*    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
-*
-* Written by Corinne Dive-Reclus(cdive@baltimore.com)
-*
-* Copyright@2001 Baltimore Technologies Ltd.
-* All right Reserved.
-*                                                                                                                                                                                               *       
-*               THIS FILE IS PROVIDED BY BALTIMORE TECHNOLOGIES ``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 BALTIMORE TECHNOLOGIES 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.                                                                                                                                                    *
-====================================================================*/
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/crypto.h>
-#include <openssl/pem.h>
-#include <openssl/dso.h>
-#include "eng_int.h"
-#include "engine.h"
-#include <openssl/engine.h>
-
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_SUREWARE
-
-#ifdef FLAT_INC
-#include "sureware.h"
-#else
-#include "vendor_defns/sureware.h"
-#endif
-
-#define SUREWARE_LIB_NAME "sureware engine"
-#include "hw_sureware_err.c"
-
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
-static int surewarehk_destroy(ENGINE *e);
-static int surewarehk_init(ENGINE *e);
-static int surewarehk_finish(ENGINE *e);
-static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-        const BIGNUM *m, BN_CTX *ctx);
-
-/* RSA stuff */
-static int surewarehk_rsa_priv_dec(int flen,const unsigned char *from,unsigned char *to,
-                        RSA *rsa,int padding);
-static int surewarehk_rsa_sign(int flen,const unsigned char *from,unsigned char *to,
-                            RSA *rsa,int padding);
-
-/* RAND stuff */
-static int surewarehk_rand_bytes(unsigned char *buf, int num);
-static void surewarehk_rand_seed(const void *buf, int num);
-static void surewarehk_rand_add(const void *buf, int num, double entropy);
-
-/* KM stuff */
-static EVP_PKEY *surewarehk_load_privkey(ENGINE *e, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
-static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
-        UI_METHOD *ui_method, void *callback_data);
-static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-        int idx,long argl, void *argp);
-#if 0
-static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-        int idx,long argl, void *argp);
-#endif
-
-#ifndef OPENSSL_NO_RSA
-/* This function is aliased to mod_exp (with the mont stuff dropped). */
-static int surewarehk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-{
-        return surewarehk_modexp(r, a, p, m, ctx);
-}
-
-/* Our internal RSA_METHOD that we provide pointers to */
-static RSA_METHOD surewarehk_rsa =
-        {
-        "SureWare RSA method",
-        NULL, /* pub_enc*/
-        NULL, /* pub_dec*/
-        surewarehk_rsa_sign, /* our rsa_sign is OpenSSL priv_enc*/
-        surewarehk_rsa_priv_dec, /* priv_dec*/
-        NULL, /*mod_exp*/
-        surewarehk_mod_exp_mont, /*mod_exp_mongomery*/
-        NULL, /* init*/
-        NULL, /* finish*/
-        0,      /* RSA flag*/
-        NULL, 
-        NULL, /* OpenSSL sign*/
-        NULL  /* OpenSSL verify*/
-        };
-#endif
-
-#ifndef OPENSSL_NO_DH
-/* Our internal DH_METHOD that we provide pointers to */
-/* This function is aliased to mod_exp (with the dh and mont dropped). */
-static int surewarehk_modexp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-        const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-{
-        return surewarehk_modexp(r, a, p, m, ctx);
-}
-
-static DH_METHOD surewarehk_dh =
-        {
-        "SureWare DH method",
-        NULL,/*gen_key*/
-        NULL,/*agree,*/
-        surewarehk_modexp_dh, /*dh mod exp*/
-        NULL, /* init*/
-        NULL, /* finish*/
-        0,    /* flags*/
-        NULL 
-        };
-#endif
-
-static RAND_METHOD surewarehk_rand =
-        {
-        /* "SureWare RAND method", */
-        surewarehk_rand_seed,
-        surewarehk_rand_bytes,
-        NULL,/*cleanup*/
-        surewarehk_rand_add,
-        surewarehk_rand_bytes,
-        NULL,/*rand_status*/
-        };
-
-#ifndef OPENSSL_NO_DSA
-/* DSA stuff */
-static  DSA_SIG * surewarehk_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
-static int surewarehk_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
-                BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
-                BN_CTX *ctx, BN_MONT_CTX *in_mont)
-{
-        BIGNUM t;
-        int to_return = 0;
-        BN_init(&t);
-        /* let rr = a1 ^ p1 mod m */
-        if (!surewarehk_modexp(rr,a1,p1,m,ctx)) goto end;
-        /* let t = a2 ^ p2 mod m */
-        if (!surewarehk_modexp(&t,a2,p2,m,ctx)) goto end;
-        /* let rr = rr * t mod m */
-        if (!BN_mod_mul(rr,rr,&t,m,ctx)) goto end;
-        to_return = 1;
-end:
-        BN_free(&t);
-        return to_return;
-}
-
-static DSA_METHOD surewarehk_dsa =
-        {
-         "SureWare DSA method", 
-        surewarehk_dsa_do_sign,
-        NULL,/*sign setup*/
-        NULL,/*verify,*/
-        surewarehk_dsa_mod_exp,/*mod exp*/
-        NULL,/*bn mod exp*/
-        NULL, /*init*/
-        NULL,/*finish*/
-        0,
-        NULL,
-        };
-#endif
-
-static const char *engine_sureware_id = "sureware";
-static const char *engine_sureware_name = "SureWare hardware engine support";
-
-/* Now, to our own code */
-
-/* As this is only ever called once, there's no need for locking
- * (indeed - the lock will already be held by our caller!!!) */
-static int bind_sureware(ENGINE *e)
-{
-#ifndef OPENSSL_NO_RSA
-        const RSA_METHOD *meth1;
-#endif
-#ifndef OPENSSL_NO_DSA
-        const DSA_METHOD *meth2;
-#endif
-#ifndef OPENSSL_NO_DH
-        const DH_METHOD *meth3;
-#endif
-
-        if(!ENGINE_set_id(e, engine_sureware_id) ||
-           !ENGINE_set_name(e, engine_sureware_name) ||
-#ifndef OPENSSL_NO_RSA
-           !ENGINE_set_RSA(e, &surewarehk_rsa) ||
-#endif
-#ifndef OPENSSL_NO_DSA
-           !ENGINE_set_DSA(e, &surewarehk_dsa) ||
-#endif
-#ifndef OPENSSL_NO_DH
-           !ENGINE_set_DH(e, &surewarehk_dh) ||
-#endif
-           !ENGINE_set_RAND(e, &surewarehk_rand) ||
-           !ENGINE_set_destroy_function(e, surewarehk_destroy) ||
-           !ENGINE_set_init_function(e, surewarehk_init) ||
-           !ENGINE_set_finish_function(e, surewarehk_finish) ||
-           !ENGINE_set_ctrl_function(e, surewarehk_ctrl) ||
-           !ENGINE_set_load_privkey_function(e, surewarehk_load_privkey) ||
-           !ENGINE_set_load_pubkey_function(e, surewarehk_load_pubkey))
-          return 0;
-
-#ifndef OPENSSL_NO_RSA
-        /* We know that the "PKCS1_SSLeay()" functions hook properly
-         * to the cswift-specific mod_exp and mod_exp_crt so we use
-         * those functions. NB: We don't use ENGINE_openssl() or
-         * anything "more generic" because something like the RSAref
-         * code may not hook properly, and if you own one of these
-         * cards then you have the right to do RSA operations on it
-         * anyway! */ 
-        meth1 = RSA_PKCS1_SSLeay();
-        if (meth1)
-        {
-                surewarehk_rsa.rsa_pub_enc = meth1->rsa_pub_enc;
-                surewarehk_rsa.rsa_pub_dec = meth1->rsa_pub_dec;
-        }
-#endif
-
-#ifndef OPENSSL_NO_DSA
-        /* Use the DSA_OpenSSL() method and just hook the mod_exp-ish
-         * bits. */
-        meth2 = DSA_OpenSSL();
-        if (meth2)
-        {
-                surewarehk_dsa.dsa_do_verify = meth2->dsa_do_verify;
-        }
-#endif
-
-#ifndef OPENSSL_NO_DH
-        /* Much the same for Diffie-Hellman */
-        meth3 = DH_OpenSSL();
-        if (meth3)
-        {
-                surewarehk_dh.generate_key = meth3->generate_key;
-                surewarehk_dh.compute_key = meth3->compute_key;
-        }
-#endif
-
-        /* Ensure the sureware error handling is set up */
-        ERR_load_SUREWARE_strings();
-        return 1;
-}
-
-#ifdef ENGINE_DYNAMIC_SUPPORT
-static int bind_helper(ENGINE *e, const char *id)
-        {
-        if(id && (strcmp(id, engine_sureware_id) != 0))
-                return 0;
-        if(!bind_sureware(e))
-                return 0;
-        return 1;
-        }       
-IMPLEMENT_DYNAMIC_CHECK_FN()
-IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
-#else
-static ENGINE *engine_sureware(void)
-        {
-        ENGINE *ret = ENGINE_new();
-        if(!ret)
-                return NULL;
-        if(!bind_sureware(ret))
-                {
-                ENGINE_free(ret);
-                return NULL;
-                }
-        return ret;
-        }
-
-void ENGINE_load_sureware(void)
-        {
-        /* Copied from eng_[openssl|dyn].c */
-        ENGINE *toadd = engine_sureware();
-        if(!toadd) return;
-        ENGINE_add(toadd);
-        ENGINE_free(toadd);
-        ERR_clear_error();
-        }
-#endif
-
-/* This is a process-global DSO handle used for loading and unloading
- * the SureWareHook library. NB: This is only set (or unset) during an
- * init() or finish() call (reference counts permitting) and they're
- * operating with global locks, so this should be thread-safe
- * implicitly. */
-static DSO *surewarehk_dso = NULL;
-#ifndef OPENSSL_NO_RSA
-static int rsaHndidx = -1;      /* Index for KM handle.  Not really used yet. */
-#endif
-#ifndef OPENSSL_NO_DSA
-static int dsaHndidx = -1;      /* Index for KM handle.  Not really used yet. */
-#endif
-
-/* These are the function pointers that are (un)set when the library has
- * successfully (un)loaded. */
-static SureWareHook_Init_t *p_surewarehk_Init = NULL;
-static SureWareHook_Finish_t *p_surewarehk_Finish = NULL;
-static SureWareHook_Rand_Bytes_t *p_surewarehk_Rand_Bytes = NULL;
-static SureWareHook_Rand_Seed_t *p_surewarehk_Rand_Seed = NULL;
-static SureWareHook_Load_Privkey_t *p_surewarehk_Load_Privkey = NULL;
-static SureWareHook_Info_Pubkey_t *p_surewarehk_Info_Pubkey = NULL;
-static SureWareHook_Load_Rsa_Pubkey_t *p_surewarehk_Load_Rsa_Pubkey = NULL;
-static SureWareHook_Load_Dsa_Pubkey_t *p_surewarehk_Load_Dsa_Pubkey = NULL;
-static SureWareHook_Free_t *p_surewarehk_Free=NULL;
-static SureWareHook_Rsa_Priv_Dec_t *p_surewarehk_Rsa_Priv_Dec=NULL;
-static SureWareHook_Rsa_Sign_t *p_surewarehk_Rsa_Sign=NULL;
-static SureWareHook_Dsa_Sign_t *p_surewarehk_Dsa_Sign=NULL;
-static SureWareHook_Mod_Exp_t *p_surewarehk_Mod_Exp=NULL;
-
-/* Used in the DSO operations. */
-static const char *surewarehk_LIBNAME = "SureWareHook";
-static const char *n_surewarehk_Init = "SureWareHook_Init";
-static const char *n_surewarehk_Finish = "SureWareHook_Finish";
-static const char *n_surewarehk_Rand_Bytes="SureWareHook_Rand_Bytes";
-static const char *n_surewarehk_Rand_Seed="SureWareHook_Rand_Seed";
-static const char *n_surewarehk_Load_Privkey="SureWareHook_Load_Privkey";
-static const char *n_surewarehk_Info_Pubkey="SureWareHook_Info_Pubkey";
-static const char *n_surewarehk_Load_Rsa_Pubkey="SureWareHook_Load_Rsa_Pubkey";
-static const char *n_surewarehk_Load_Dsa_Pubkey="SureWareHook_Load_Dsa_Pubkey";
-static const char *n_surewarehk_Free="SureWareHook_Free";
-static const char *n_surewarehk_Rsa_Priv_Dec="SureWareHook_Rsa_Priv_Dec";
-static const char *n_surewarehk_Rsa_Sign="SureWareHook_Rsa_Sign";
-static const char *n_surewarehk_Dsa_Sign="SureWareHook_Dsa_Sign";
-static const char *n_surewarehk_Mod_Exp="SureWareHook_Mod_Exp";
-static BIO *logstream = NULL;
-
-/* SureWareHook library functions and mechanics - these are used by the
- * higher-level functions further down. NB: As and where there's no
- * error checking, take a look lower down where these functions are
- * called, the checking and error handling is probably down there. 
-*/
-static int threadsafe=1;
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-{
-        int to_return = 1;
-
-        switch(cmd)
-        {
-                case ENGINE_CTRL_SET_LOGSTREAM:
-                {
-                        BIO *bio = (BIO *)p;
-                        CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                        if (logstream)
-                        {
-                                BIO_free(logstream);
-                                logstream = NULL;
-                        }
-                        if (CRYPTO_add(&bio->references,1,CRYPTO_LOCK_BIO) > 1)
-                                logstream = bio;
-                        else
-                                SUREWAREerr(SUREWARE_F_SUREWAREHK_CTRL,SUREWARE_R_BIO_WAS_FREED);
-                }
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-        /* This will prevent the initialisation function from "installing"
-         * the mutex-handling callbacks, even if they are available from
-         * within the library (or were provided to the library from the
-         * calling application). This is to remove any baggage for
-         * applications not using multithreading. */
-        case ENGINE_CTRL_CHIL_NO_LOCKING:
-                CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
-                threadsafe = 0;
-                CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-                break;
-
-        /* The command isn't understood by this engine */
-        default:
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_CTRL,
-                        ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED);
-                to_return = 0;
-                break;
-                }
-
-        return to_return;
-}
-
-/* Destructor (complements the "ENGINE_surewarehk()" constructor) */
-static int surewarehk_destroy(ENGINE *e)
-{
-        ERR_unload_SUREWARE_strings();
-        return 1;
-}
-
-/* (de)initialisation functions. */
-static int surewarehk_init(ENGINE *e)
-{
-        char msg[64]="ENGINE_init";
-        SureWareHook_Init_t *p1=NULL;
-        SureWareHook_Finish_t *p2=NULL;
-        SureWareHook_Rand_Bytes_t *p3=NULL;
-        SureWareHook_Rand_Seed_t *p4=NULL;
-        SureWareHook_Load_Privkey_t *p5=NULL;
-        SureWareHook_Load_Rsa_Pubkey_t *p6=NULL;
-        SureWareHook_Free_t *p7=NULL;
-        SureWareHook_Rsa_Priv_Dec_t *p8=NULL;
-        SureWareHook_Rsa_Sign_t *p9=NULL;
-        SureWareHook_Dsa_Sign_t *p12=NULL;
-        SureWareHook_Info_Pubkey_t *p13=NULL;
-        SureWareHook_Load_Dsa_Pubkey_t *p14=NULL;
-        SureWareHook_Mod_Exp_t *p15=NULL;
-
-        if(surewarehk_dso != NULL)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_INIT,ENGINE_R_ALREADY_LOADED);
-                goto err;
-        }
-        /* Attempt to load libsurewarehk.so/surewarehk.dll/whatever. */
-        surewarehk_dso = DSO_load(NULL, surewarehk_LIBNAME, NULL, 0);
-        if(surewarehk_dso == NULL)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_INIT,ENGINE_R_DSO_FAILURE);
-                goto err;
-        }
-        if(!(p1=(SureWareHook_Init_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Init)) ||
-           !(p2=(SureWareHook_Finish_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Finish)) ||
-           !(p3=(SureWareHook_Rand_Bytes_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Rand_Bytes)) ||
-           !(p4=(SureWareHook_Rand_Seed_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Rand_Seed)) ||
-           !(p5=(SureWareHook_Load_Privkey_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Load_Privkey)) ||
-           !(p6=(SureWareHook_Load_Rsa_Pubkey_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Load_Rsa_Pubkey)) ||
-           !(p7=(SureWareHook_Free_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Free)) ||
-           !(p8=(SureWareHook_Rsa_Priv_Dec_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Rsa_Priv_Dec)) ||
-           !(p9=(SureWareHook_Rsa_Sign_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Rsa_Sign)) ||
-           !(p12=(SureWareHook_Dsa_Sign_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Dsa_Sign)) ||
-           !(p13=(SureWareHook_Info_Pubkey_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Info_Pubkey)) ||
-           !(p14=(SureWareHook_Load_Dsa_Pubkey_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Load_Dsa_Pubkey)) ||
-           !(p15=(SureWareHook_Mod_Exp_t*)DSO_bind_func(surewarehk_dso, n_surewarehk_Mod_Exp)))
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_INIT,ENGINE_R_DSO_FAILURE);
-                goto err;
-        }
-        /* Copy the pointers */
-        p_surewarehk_Init = p1;
-        p_surewarehk_Finish = p2;
-        p_surewarehk_Rand_Bytes = p3;
-        p_surewarehk_Rand_Seed = p4;
-        p_surewarehk_Load_Privkey = p5;
-        p_surewarehk_Load_Rsa_Pubkey = p6;
-        p_surewarehk_Free = p7;
-        p_surewarehk_Rsa_Priv_Dec = p8;
-        p_surewarehk_Rsa_Sign = p9;
-        p_surewarehk_Dsa_Sign = p12;
-        p_surewarehk_Info_Pubkey = p13;
-        p_surewarehk_Load_Dsa_Pubkey = p14;
-        p_surewarehk_Mod_Exp = p15;
-        /* Contact the hardware and initialises it. */
-        if(p_surewarehk_Init(msg,threadsafe)==SUREWAREHOOK_ERROR_UNIT_FAILURE)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_INIT,SUREWARE_R_UNIT_FAILURE);
-                goto err;
-        }
-        if(p_surewarehk_Init(msg,threadsafe)==SUREWAREHOOK_ERROR_UNIT_FAILURE)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_INIT,SUREWARE_R_UNIT_FAILURE);
-                goto err;
-        }
-        /* try to load the default private key, if failed does not return a failure but
-           wait for an explicit ENGINE_load_privakey */
-        surewarehk_load_privkey(e,NULL,NULL,NULL);
-
-        /* Everything's fine. */
-#ifndef OPENSSL_NO_RSA
-        if (rsaHndidx == -1)
-                rsaHndidx = RSA_get_ex_new_index(0,
-                                                "SureWareHook RSA key handle",
-                                                NULL, NULL, surewarehk_ex_free);
-#endif
-#ifndef OPENSSL_NO_DSA
-        if (dsaHndidx == -1)
-                dsaHndidx = DSA_get_ex_new_index(0,
-                                                "SureWareHook DSA key handle",
-                                                NULL, NULL, surewarehk_ex_free);
-#endif
-
-        return 1;
-err:
-        if(surewarehk_dso)
-                DSO_free(surewarehk_dso);
-        surewarehk_dso = NULL;
-        p_surewarehk_Init = NULL;
-        p_surewarehk_Finish = NULL;
-        p_surewarehk_Rand_Bytes = NULL;
-        p_surewarehk_Rand_Seed = NULL;
-        p_surewarehk_Load_Privkey = NULL;
-        p_surewarehk_Load_Rsa_Pubkey = NULL;
-        p_surewarehk_Free = NULL;
-        p_surewarehk_Rsa_Priv_Dec = NULL;
-        p_surewarehk_Rsa_Sign = NULL;
-        p_surewarehk_Dsa_Sign = NULL;
-        p_surewarehk_Info_Pubkey = NULL;
-        p_surewarehk_Load_Dsa_Pubkey = NULL;
-        p_surewarehk_Mod_Exp = NULL;
-        return 0;
-}
-
-static int surewarehk_finish(ENGINE *e)
-{
-        int to_return = 1;
-        if(surewarehk_dso == NULL)
-                {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_FINISH,ENGINE_R_NOT_LOADED);
-                to_return = 0;
-                goto err;
-                }
-        p_surewarehk_Finish();
-        if(!DSO_free(surewarehk_dso))
-                {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_FINISH,ENGINE_R_DSO_FAILURE);
-                to_return = 0;
-                goto err;
-                }
- err:
-        if (logstream)
-                BIO_free(logstream);
-        surewarehk_dso = NULL;
-        p_surewarehk_Init = NULL;
-        p_surewarehk_Finish = NULL;
-        p_surewarehk_Rand_Bytes = NULL;
-        p_surewarehk_Rand_Seed = NULL;
-        p_surewarehk_Load_Privkey = NULL;
-        p_surewarehk_Load_Rsa_Pubkey = NULL;
-        p_surewarehk_Free = NULL;
-        p_surewarehk_Rsa_Priv_Dec = NULL;
-        p_surewarehk_Rsa_Sign = NULL;
-        p_surewarehk_Dsa_Sign = NULL;
-        p_surewarehk_Info_Pubkey = NULL;
-        p_surewarehk_Load_Dsa_Pubkey = NULL;
-        p_surewarehk_Mod_Exp = NULL;
-        return to_return;
-}
-
-static void surewarehk_error_handling(char *const msg,int func,int ret)
-{
-        switch (ret)
-        {
-                case SUREWAREHOOK_ERROR_UNIT_FAILURE:
-                        ENGINEerr(func,SUREWARE_R_UNIT_FAILURE);
-                        break;
-                case SUREWAREHOOK_ERROR_FALLBACK:
-                        ENGINEerr(func,SUREWARE_R_REQUEST_FALLBACK);
-                        break;
-                case SUREWAREHOOK_ERROR_DATA_SIZE:
-                        ENGINEerr(func,SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                        break;
-                case SUREWAREHOOK_ERROR_INVALID_PAD:
-                        ENGINEerr(func,RSA_R_PADDING_CHECK_FAILED);
-                        break;
-                default:
-                        ENGINEerr(func,SUREWARE_R_REQUEST_FAILED);
-                        break;
-                case 1:/*nothing*/
-                        msg[0]='\0';
-        }
-        if (*msg)
-        {
-                ERR_add_error_data(1,msg);
-                if (logstream)
-                {
-                        CRYPTO_w_lock(CRYPTO_LOCK_BIO);
-                        BIO_write(logstream, msg, strlen(msg));
-                        CRYPTO_w_unlock(CRYPTO_LOCK_BIO);
-                }
-        }
-}
-
-static int surewarehk_rand_bytes(unsigned char *buf, int num)
-{
-        int ret=0;
-        char msg[64]="ENGINE_rand_bytes";
-        if(!p_surewarehk_Rand_Bytes)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RAND_BYTES,ENGINE_R_NOT_INITIALISED);
-        }
-        else
-        {
-                ret = p_surewarehk_Rand_Bytes(msg,buf, num);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_RAND_BYTES,ret);
-        }
-        return ret==1 ? 1 : 0;
-}
-
-static void surewarehk_rand_seed(const void *buf, int num)
-{
-        int ret=0;
-        char msg[64]="ENGINE_rand_seed";
-        if(!p_surewarehk_Rand_Seed)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RAND_SEED,ENGINE_R_NOT_INITIALISED);
-        }
-        else
-        {
-                ret = p_surewarehk_Rand_Seed(msg,buf, num);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_RAND_SEED,ret);
-        }
-}
-
-static void surewarehk_rand_add(const void *buf, int num, double entropy)
-{
-        surewarehk_rand_seed(buf,num);
-}
-
-static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,unsigned long el,char keytype)
-{
-        EVP_PKEY *res = NULL;
-#ifndef OPENSSL_NO_RSA
-        RSA *rsatmp = NULL;
-#endif
-#ifndef OPENSSL_NO_DSA
-        DSA *dsatmp=NULL;
-#endif
-        char msg[64]="sureware_load_public";
-        int ret=0;
-        if(!p_surewarehk_Load_Rsa_Pubkey || !p_surewarehk_Load_Dsa_Pubkey)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ENGINE_R_NOT_INITIALISED);
-                goto err;
-        }
-        switch (keytype)
-        {
-#ifndef OPENSSL_NO_RSA
-        case 1: /*RSA*/
-                /* set private external reference */
-                rsatmp = RSA_new_method(e);
-                RSA_set_ex_data(rsatmp,rsaHndidx,hptr);
-                rsatmp->flags |= RSA_FLAG_EXT_PKEY;
-
-                /* set public big nums*/
-                rsatmp->e = BN_new();
-                rsatmp->n = BN_new();
-                bn_expand2(rsatmp->e, el/sizeof(BN_ULONG));
-                bn_expand2(rsatmp->n, el/sizeof(BN_ULONG));
-                if (!rsatmp->e || rsatmp->e->dmax!=(int)(el/sizeof(BN_ULONG))|| 
-                        !rsatmp->n || rsatmp->n->dmax!=(int)(el/sizeof(BN_ULONG)))
-                        goto err;
-                ret=p_surewarehk_Load_Rsa_Pubkey(msg,key_id,el,
-                                                 (unsigned long *)rsatmp->n->d,
-                                                 (unsigned long *)rsatmp->e->d);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ret);
-                if (ret!=1)
-                {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
-                        goto err;
-                }
-                /* normalise pub e and pub n */
-                rsatmp->e->top=el/sizeof(BN_ULONG);
-                bn_fix_top(rsatmp->e);
-                rsatmp->n->top=el/sizeof(BN_ULONG);
-                bn_fix_top(rsatmp->n);
-                /* create an EVP object: engine + rsa key */
-                res = EVP_PKEY_new();
-                EVP_PKEY_assign_RSA(res, rsatmp);
-                break;
-#endif
-
-#ifndef OPENSSL_NO_DSA
-        case 2:/*DSA*/
-                /* set private/public external reference */
-                dsatmp = DSA_new_method(e);
-                DSA_set_ex_data(dsatmp,dsaHndidx,hptr);
-                /*dsatmp->flags |= DSA_FLAG_EXT_PKEY;*/
-
-                /* set public key*/
-                dsatmp->pub_key = BN_new();
-                dsatmp->p = BN_new();
-                dsatmp->q = BN_new();
-                dsatmp->g = BN_new();
-                bn_expand2(dsatmp->pub_key, el/sizeof(BN_ULONG));
-                bn_expand2(dsatmp->p, el/sizeof(BN_ULONG));
-                bn_expand2(dsatmp->q, 20/sizeof(BN_ULONG));
-                bn_expand2(dsatmp->g, el/sizeof(BN_ULONG));
-                if (!dsatmp->pub_key || dsatmp->pub_key->dmax!=(int)(el/sizeof(BN_ULONG))|| 
-                        !dsatmp->p || dsatmp->p->dmax!=(int)(el/sizeof(BN_ULONG)) ||
-                        !dsatmp->q || dsatmp->q->dmax!=20/sizeof(BN_ULONG) ||
-                        !dsatmp->g || dsatmp->g->dmax!=(int)(el/sizeof(BN_ULONG)))
-                        goto err;
-
-                ret=p_surewarehk_Load_Dsa_Pubkey(msg,key_id,el,
-                                                 (unsigned long *)dsatmp->pub_key->d, 
-                                                 (unsigned long *)dsatmp->p->d,
-                                                 (unsigned long *)dsatmp->q->d,
-                                                 (unsigned long *)dsatmp->g->d);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ret);
-                if (ret!=1)
-                {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
-                        goto err;
-                }
-                /* set parameters */
-                /* normalise pubkey and parameters in case of */
-                dsatmp->pub_key->top=el/sizeof(BN_ULONG);
-                bn_fix_top(dsatmp->pub_key);
-                dsatmp->p->top=el/sizeof(BN_ULONG);
-                bn_fix_top(dsatmp->p);
-                dsatmp->q->top=20/sizeof(BN_ULONG);
-                bn_fix_top(dsatmp->q);
-                dsatmp->g->top=el/sizeof(BN_ULONG);
-                bn_fix_top(dsatmp->g);
-
-                /* create an EVP object: engine + rsa key */
-                res = EVP_PKEY_new();
-                EVP_PKEY_assign_DSA(res, dsatmp);
-                break;
-#endif
-
-        default:
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PRIVATE_KEY);
-                goto err;
-        }
-        return res;
- err:
-        if (res)
-                EVP_PKEY_free(res);
-#ifndef OPENSSL_NO_RSA
-        if (rsatmp)
-                RSA_free(rsatmp);
-#endif
-#ifndef OPENSSL_NO_DSA
-        if (dsatmp)
-                DSA_free(dsatmp);
-#endif
-        return NULL;
-}
-
-static EVP_PKEY *surewarehk_load_privkey(ENGINE *e, const char *key_id,
-                                         UI_METHOD *ui_method, void *callback_data)
-{
-        EVP_PKEY *res = NULL;
-        int ret=0;
-        unsigned long el=0;
-        char *hptr=NULL;
-        char keytype=0;
-        char msg[64]="ENGINE_load_privkey";
-
-        if(!p_surewarehk_Load_Privkey)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_NOT_INITIALISED);
-        }
-        else
-        {
-                ret=p_surewarehk_Load_Privkey(msg,key_id,&hptr,&el,&keytype);
-                if (ret!=1)
-                {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PRIVATE_KEY);
-                        ERR_add_error_data(1,msg);              
-                }
-                else
-                        res=sureware_load_public(e,key_id,hptr,el,keytype);
-        }
-        return res;
-}
-
-static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
-                                         UI_METHOD *ui_method, void *callback_data)
-{
-        EVP_PKEY *res = NULL;
-        int ret=0;
-        unsigned long el=0;
-        char *hptr=NULL;
-        char keytype=0;
-        char msg[64]="ENGINE_load_pubkey";
-
-        if(!p_surewarehk_Info_Pubkey)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ENGINE_R_NOT_INITIALISED);
-        }
-        else
-        {
-                /* call once to identify if DSA or RSA */
-                ret=p_surewarehk_Info_Pubkey(msg,key_id,&el,&keytype);
-                if (ret!=1)
-                {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
-                        ERR_add_error_data(1,msg);
-                }
-                else
-                        res=sureware_load_public(e,key_id,hptr,el,keytype);
-        }
-        return res;
-}
-
-/* This cleans up an RSA/DSA KM key(do not destroy the key into the hardware)
-, called when ex_data is freed */
-static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-        int idx,long argl, void *argp)
-{
-        if(!p_surewarehk_Free)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_EX_FREE,ENGINE_R_NOT_INITIALISED);
-        }
-        else
-                p_surewarehk_Free((char *)item,0);
-}
-
-#if 0
-/* This cleans up an DH KM key (destroys the key into hardware), 
-called when ex_data is freed */
-static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
-        int idx,long argl, void *argp)
-{
-        if(!p_surewarehk_Free)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_EX_FREE,ENGINE_R_NOT_INITIALISED);
-        }
-        else
-                p_surewarehk_Free((char *)item,1);
-}
-#endif
-
-/*
-* return number of decrypted bytes
-*/
-#ifndef OPENSSL_NO_RSA
-static int surewarehk_rsa_priv_dec(int flen,const unsigned char *from,unsigned char *to,
-                        RSA *rsa,int padding)
-{
-        int ret=0,tlen;
-        char *buf=NULL,*hptr=NULL;
-        char msg[64]="ENGINE_rsa_priv_dec";
-        if (!p_surewarehk_Rsa_Priv_Dec)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,ENGINE_R_NOT_INITIALISED);
-        }
-        /* extract ref to private key */
-        else if (!(hptr=RSA_get_ex_data(rsa, rsaHndidx)))
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,SUREWARE_R_MISSING_KEY_COMPONENTS);
-                goto err;
-        }
-        /* analyse what padding we can do into the hardware */
-        if (padding==RSA_PKCS1_PADDING)
-        {
-                /* do it one shot */
-                ret=p_surewarehk_Rsa_Priv_Dec(msg,flen,(unsigned char *)from,&tlen,to,hptr,SUREWARE_PKCS1_PAD);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,ret);
-                if (ret!=1)
-                        goto err;
-                ret=tlen;
-        }
-        else /* do with no padding into hardware */
-        {
-                ret=p_surewarehk_Rsa_Priv_Dec(msg,flen,(unsigned char *)from,&tlen,to,hptr,SUREWARE_NO_PAD);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,ret);
-                if (ret!=1)
-                        goto err;
-                /* intermediate buffer for padding */
-                if ((buf=OPENSSL_malloc(tlen)) == NULL)
-                {
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                }
-                memcpy(buf,to,tlen);/* transfert to into buf */
-                switch (padding) /* check padding in software */
-                {
-#ifndef OPENSSL_NO_SHA
-                case RSA_PKCS1_OAEP_PADDING:
-                        ret=RSA_padding_check_PKCS1_OAEP(to,tlen,(unsigned char *)buf,tlen,tlen,NULL,0);
-                        break;
-#endif
-                case RSA_SSLV23_PADDING:
-                        ret=RSA_padding_check_SSLv23(to,tlen,(unsigned char *)buf,flen,tlen);
-                        break;
-                case RSA_NO_PADDING:
-                        ret=RSA_padding_check_none(to,tlen,(unsigned char *)buf,flen,tlen);
-                        break;
-                default:
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,RSA_R_UNKNOWN_PADDING_TYPE);
-                        goto err;
-                }
-                if (ret < 0)
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,RSA_R_PADDING_CHECK_FAILED);
-        }
-err:
-        if (buf)
-        {
-                OPENSSL_cleanse(buf,tlen);
-                OPENSSL_free(buf);
-        }
-        return ret;
-}
-
-/*
-* Does what OpenSSL rsa_priv_enc does.
-*/
-static int surewarehk_rsa_sign(int flen,const unsigned char *from,unsigned char *to,
-                            RSA *rsa,int padding)
-{
-        int ret=0,tlen;
-        char *hptr=NULL;
-        char msg[64]="ENGINE_rsa_sign";
-        if (!p_surewarehk_Rsa_Sign)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,ENGINE_R_NOT_INITIALISED);
-        }
-        /* extract ref to private key */
-        else if (!(hptr=RSA_get_ex_data(rsa, rsaHndidx)))
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,SUREWARE_R_MISSING_KEY_COMPONENTS);
-        }
-        else
-        {
-                switch (padding)
-                {
-                case RSA_PKCS1_PADDING: /* do it in one shot */
-                        ret=p_surewarehk_Rsa_Sign(msg,flen,(unsigned char *)from,&tlen,to,hptr,SUREWARE_PKCS1_PAD);
-                        surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,ret);
-                        break;
-                case RSA_NO_PADDING:
-                default:
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,RSA_R_UNKNOWN_PADDING_TYPE);
-                }
-        }
-        return ret==1 ? tlen : ret;
-}
-
-#endif
-
-#ifndef OPENSSL_NO_DSA
-/* DSA sign and verify */
-static  DSA_SIG * surewarehk_dsa_do_sign(const unsigned char *from, int flen, DSA *dsa)
-{
-        int ret=0;
-        char *hptr=NULL;
-        DSA_SIG *psign=NULL;
-        char msg[64]="ENGINE_dsa_do_sign";
-        if (!p_surewarehk_Dsa_Sign)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,ENGINE_R_NOT_INITIALISED);
-        }
-        /* extract ref to private key */
-        else if (!(hptr=DSA_get_ex_data(dsa, dsaHndidx)))
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,SUREWARE_R_MISSING_KEY_COMPONENTS);
-        }
-        else
-        {
-                if((psign = DSA_SIG_new()) == NULL)
-                {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,ERR_R_MALLOC_FAILURE);
-                        goto err;
-                }
-                psign->r=BN_new();
-                psign->s=BN_new();
-                bn_expand2(psign->r, 20/sizeof(BN_ULONG));
-                bn_expand2(psign->s, 20/sizeof(BN_ULONG));
-                if (!psign->r || psign->r->dmax!=20/sizeof(BN_ULONG) ||
-                        !psign->s || psign->s->dmax!=20/sizeof(BN_ULONG))
-                        goto err;
-                ret=p_surewarehk_Dsa_Sign(msg,flen,from,
-                                          (unsigned long *)psign->r->d,
-                                          (unsigned long *)psign->s->d,
-                                          hptr);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,ret);
-        }
-        psign->r->top=20/sizeof(BN_ULONG);
-        bn_fix_top(psign->r);
-        psign->s->top=20/sizeof(BN_ULONG);
-        bn_fix_top(psign->s);
-
-err:    
-        if (psign)
-        {
-                DSA_SIG_free(psign);
-                psign=NULL;
-        }
-        return psign;
-}
-#endif
-
-static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                             const BIGNUM *m, BN_CTX *ctx)
-{
-        int ret=0;
-        char msg[64]="ENGINE_modexp";
-        if (!p_surewarehk_Mod_Exp)
-        {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_MOD_EXP,ENGINE_R_NOT_INITIALISED);
-        }
-        else
-        {
-                bn_expand2(r,m->top);
-                if (r && r->dmax==m->top)
-                {
-                        /* do it*/
-                        ret=p_surewarehk_Mod_Exp(msg,
-                                                 m->top*sizeof(BN_ULONG),
-                                                 (unsigned long *)m->d,
-                                                 p->top*sizeof(BN_ULONG),
-                                                 (unsigned long *)p->d,
-                                                 a->top*sizeof(BN_ULONG),
-                                                 (unsigned long *)a->d,
-                                                 (unsigned long *)r->d);
-                        surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_MOD_EXP,ret);
-                        if (ret==1)
-                        {
-                                /* normalise result */
-                                r->top=m->top;
-                                bn_fix_top(r);
-                        }
-                }
-        }
-        return ret;
-}
-#endif /* !OPENSSL_NO_HW_SureWare */
-#endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/hw_ubsec.c b/src/lib/libcrypto/engine/hw_ubsec.c
deleted file mode 100644
index 8fb834af31..0000000000
--- a/src/lib/libcrypto/engine/hw_ubsec.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/* crypto/engine/hw_ubsec.c */
-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
- * project 2000.
- *
- * Cloned shamelessly by Joe Tardo. 
- */
-/* ====================================================================
- * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/dso.h>
-#include <openssl/engine.h>
-
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_UBSEC
-
-#ifdef FLAT_INC
-#include "hw_ubsec.h"
-#else
-#include "vendor_defns/hw_ubsec.h"
-#endif
-
-#define UBSEC_LIB_NAME "ubsec engine"
-#include "hw_ubsec_err.c"
-
-#define FAIL_TO_SOFTWARE -15
-
-static int ubsec_destroy(ENGINE *e);
-static int ubsec_init(ENGINE *e);
-static int ubsec_finish(ENGINE *e);
-static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
-static int ubsec_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx);
-static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *q, const BIGNUM *dp,
-                        const BIGNUM *dq, const BIGNUM *qinv, BN_CTX *ctx);
-#ifndef OPENSSL_NO_RSA
-static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-#endif
-static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-#ifndef OPENSSL_NO_DSA
-#ifdef NOT_USED
-static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
-                BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
-                BN_CTX *ctx, BN_MONT_CTX *in_mont);
-static int ubsec_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
-                const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *m_ctx);
-#endif
-static DSA_SIG *ubsec_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
-static int ubsec_dsa_verify(const unsigned char *dgst, int dgst_len,
-                                DSA_SIG *sig, DSA *dsa);
-#endif
-#ifndef OPENSSL_NO_DH
-static int ubsec_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-                const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *m_ctx);
-static int ubsec_dh_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);
-static int ubsec_dh_generate_key(DH *dh);
-#endif
-
-#ifdef NOT_USED
-static int ubsec_rand_bytes(unsigned char *buf, int num);
-static int ubsec_rand_status(void);
-#endif
-
-#define UBSEC_CMD_SO_PATH               ENGINE_CMD_BASE
-static const ENGINE_CMD_DEFN ubsec_cmd_defns[] = {
-        {UBSEC_CMD_SO_PATH,
-                "SO_PATH",
-                "Specifies the path to the 'ubsec' shared library",
-                ENGINE_CMD_FLAG_STRING},
-        {0, NULL, NULL, 0}
-        };
-
-#ifndef OPENSSL_NO_RSA
-/* Our internal RSA_METHOD that we provide pointers to */
-static RSA_METHOD ubsec_rsa =
-        {
-        "UBSEC RSA method",
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        ubsec_rsa_mod_exp,
-        ubsec_mod_exp_mont,
-        NULL,
-        NULL,
-        0,
-        NULL,
-        NULL,
-        NULL
-        };
-#endif
-
-#ifndef OPENSSL_NO_DSA
-/* Our internal DSA_METHOD that we provide pointers to */
-static DSA_METHOD ubsec_dsa =
-        {
-        "UBSEC DSA method",
-        ubsec_dsa_do_sign, /* dsa_do_sign */
-        NULL, /* dsa_sign_setup */
-        ubsec_dsa_verify, /* dsa_do_verify */
-        NULL, /* ubsec_dsa_mod_exp */ /* dsa_mod_exp */
-        NULL, /* ubsec_mod_exp_dsa */ /* bn_mod_exp */
-        NULL, /* init */
-        NULL, /* finish */
-        0, /* flags */
-        NULL /* app_data */
-        };
-#endif
-
-#ifndef OPENSSL_NO_DH
-/* Our internal DH_METHOD that we provide pointers to */
-static DH_METHOD ubsec_dh =
-        {
-        "UBSEC DH method",
-        ubsec_dh_generate_key,
-        ubsec_dh_compute_key,
-        ubsec_mod_exp_dh,
-        NULL,
-        NULL,
-        0,
-        NULL
-        };
-#endif
-
-/* Constants used when creating the ENGINE */
-static const char *engine_ubsec_id = "ubsec";
-static const char *engine_ubsec_name = "UBSEC hardware engine support";
-
-/* This internal function is used by ENGINE_ubsec() and possibly by the
- * "dynamic" ENGINE support too */
-static int bind_helper(ENGINE *e)
-        {
-#ifndef OPENSSL_NO_RSA
-        const RSA_METHOD *meth1;
-#endif
-#ifndef OPENSSL_NO_DH
-#ifndef HAVE_UBSEC_DH
-        const DH_METHOD *meth3;
-#endif /* HAVE_UBSEC_DH */
-#endif
-        if(!ENGINE_set_id(e, engine_ubsec_id) ||
-                        !ENGINE_set_name(e, engine_ubsec_name) ||
-#ifndef OPENSSL_NO_RSA
-                        !ENGINE_set_RSA(e, &ubsec_rsa) ||
-#endif
-#ifndef OPENSSL_NO_DSA
-                        !ENGINE_set_DSA(e, &ubsec_dsa) ||
-#endif
-#ifndef OPENSSL_NO_DH
-                        !ENGINE_set_DH(e, &ubsec_dh) ||
-#endif
-                        !ENGINE_set_destroy_function(e, ubsec_destroy) ||
-                        !ENGINE_set_init_function(e, ubsec_init) ||
-                        !ENGINE_set_finish_function(e, ubsec_finish) ||
-                        !ENGINE_set_ctrl_function(e, ubsec_ctrl) ||
-                        !ENGINE_set_cmd_defns(e, ubsec_cmd_defns))
-                return 0;
-
-#ifndef OPENSSL_NO_RSA
-        /* We know that the "PKCS1_SSLeay()" functions hook properly
-         * to the Broadcom-specific mod_exp and mod_exp_crt so we use
-         * those functions. NB: We don't use ENGINE_openssl() or
-         * anything "more generic" because something like the RSAref
-         * code may not hook properly, and if you own one of these
-         * cards then you have the right to do RSA operations on it
-         * anyway! */ 
-        meth1 = RSA_PKCS1_SSLeay();
-        ubsec_rsa.rsa_pub_enc = meth1->rsa_pub_enc;
-        ubsec_rsa.rsa_pub_dec = meth1->rsa_pub_dec;
-        ubsec_rsa.rsa_priv_enc = meth1->rsa_priv_enc;
-        ubsec_rsa.rsa_priv_dec = meth1->rsa_priv_dec;
-#endif
-
-#ifndef OPENSSL_NO_DH
-#ifndef HAVE_UBSEC_DH
-        /* Much the same for Diffie-Hellman */
-        meth3 = DH_OpenSSL();
-        ubsec_dh.generate_key = meth3->generate_key;
-        ubsec_dh.compute_key = meth3->compute_key;
-#endif /* HAVE_UBSEC_DH */
-#endif
-
-        /* Ensure the ubsec error handling is set up */
-        ERR_load_UBSEC_strings();
-        return 1;
-        }
-
-#ifndef ENGINE_DYNAMIC_SUPPORT
-static ENGINE *engine_ubsec(void)
-        {
-        ENGINE *ret = ENGINE_new();
-        if(!ret)
-                return NULL;
-        if(!bind_helper(ret))
-                {
-                ENGINE_free(ret);
-                return NULL;
-                }
-        return ret;
-        }
-
-void ENGINE_load_ubsec(void)
-        {
-        /* Copied from eng_[openssl|dyn].c */
-        ENGINE *toadd = engine_ubsec();
-        if(!toadd) return;
-        ENGINE_add(toadd);
-        ENGINE_free(toadd);
-        ERR_clear_error();
-        }
-#endif
-
-/* This is a process-global DSO handle used for loading and unloading
- * the UBSEC library. NB: This is only set (or unset) during an
- * init() or finish() call (reference counts permitting) and they're
- * operating with global locks, so this should be thread-safe
- * implicitly. */
-
-static DSO *ubsec_dso = NULL;
-
-/* These are the function pointers that are (un)set when the library has
- * successfully (un)loaded. */
-
-static t_UBSEC_ubsec_bytes_to_bits *p_UBSEC_ubsec_bytes_to_bits = NULL;
-static t_UBSEC_ubsec_bits_to_bytes *p_UBSEC_ubsec_bits_to_bytes = NULL;
-static t_UBSEC_ubsec_open *p_UBSEC_ubsec_open = NULL;
-static t_UBSEC_ubsec_close *p_UBSEC_ubsec_close = NULL;
-#ifndef OPENSSL_NO_DH
-static t_UBSEC_diffie_hellman_generate_ioctl 
-        *p_UBSEC_diffie_hellman_generate_ioctl = NULL;
-static t_UBSEC_diffie_hellman_agree_ioctl *p_UBSEC_diffie_hellman_agree_ioctl = NULL;
-#endif
-/* #ifndef OPENSSL_NO_RSA */
-static t_UBSEC_rsa_mod_exp_ioctl *p_UBSEC_rsa_mod_exp_ioctl = NULL;
-static t_UBSEC_rsa_mod_exp_crt_ioctl *p_UBSEC_rsa_mod_exp_crt_ioctl = NULL;
-/* #endif */
-#ifndef OPENSSL_NO_DSA
-static t_UBSEC_dsa_sign_ioctl *p_UBSEC_dsa_sign_ioctl = NULL;
-static t_UBSEC_dsa_verify_ioctl *p_UBSEC_dsa_verify_ioctl = NULL;
-#endif
-static t_UBSEC_math_accelerate_ioctl *p_UBSEC_math_accelerate_ioctl = NULL;
-static t_UBSEC_rng_ioctl *p_UBSEC_rng_ioctl = NULL;
-static t_UBSEC_max_key_len_ioctl *p_UBSEC_max_key_len_ioctl = NULL;
-
-static int max_key_len = 1024;  /* ??? */
-
-/* 
- * These are the static string constants for the DSO file name and the function
- * symbol names to bind to. 
- */
-
-static const char *UBSEC_LIBNAME = NULL;
-static const char *get_UBSEC_LIBNAME(void)
-        {
-        if(UBSEC_LIBNAME)
-                return UBSEC_LIBNAME;
-        return "ubsec";
-        }
-static void free_UBSEC_LIBNAME(void)
-        {
-        if(UBSEC_LIBNAME)
-                OPENSSL_free((void*)UBSEC_LIBNAME);
-        UBSEC_LIBNAME = NULL;
-        }
-static long set_UBSEC_LIBNAME(const char *name)
-        {
-        free_UBSEC_LIBNAME();
-        return (((UBSEC_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
-        }
-static const char *UBSEC_F1 = "ubsec_bytes_to_bits";
-static const char *UBSEC_F2 = "ubsec_bits_to_bytes";
-static const char *UBSEC_F3 = "ubsec_open";
-static const char *UBSEC_F4 = "ubsec_close";
-#ifndef OPENSSL_NO_DH
-static const char *UBSEC_F5 = "diffie_hellman_generate_ioctl";
-static const char *UBSEC_F6 = "diffie_hellman_agree_ioctl";
-#endif
-/* #ifndef OPENSSL_NO_RSA */
-static const char *UBSEC_F7 = "rsa_mod_exp_ioctl";
-static const char *UBSEC_F8 = "rsa_mod_exp_crt_ioctl";
-/* #endif */
-#ifndef OPENSSL_NO_DSA
-static const char *UBSEC_F9 = "dsa_sign_ioctl";
-static const char *UBSEC_F10 = "dsa_verify_ioctl";
-#endif
-static const char *UBSEC_F11 = "math_accelerate_ioctl";
-static const char *UBSEC_F12 = "rng_ioctl";
-static const char *UBSEC_F13 = "ubsec_max_key_len_ioctl";
-
-/* Destructor (complements the "ENGINE_ubsec()" constructor) */
-static int ubsec_destroy(ENGINE *e)
-        {
-        free_UBSEC_LIBNAME();
-        ERR_unload_UBSEC_strings();
-        return 1;
-        }
-
-/* (de)initialisation functions. */
-static int ubsec_init(ENGINE *e)
-        {
-        t_UBSEC_ubsec_bytes_to_bits *p1;
-        t_UBSEC_ubsec_bits_to_bytes *p2;
-        t_UBSEC_ubsec_open *p3;
-        t_UBSEC_ubsec_close *p4;
-#ifndef OPENSSL_NO_DH
-        t_UBSEC_diffie_hellman_generate_ioctl *p5;
-        t_UBSEC_diffie_hellman_agree_ioctl *p6;
-#endif
-/* #ifndef OPENSSL_NO_RSA */
-        t_UBSEC_rsa_mod_exp_ioctl *p7;
-        t_UBSEC_rsa_mod_exp_crt_ioctl *p8;
-/* #endif */
-#ifndef OPENSSL_NO_DSA
-        t_UBSEC_dsa_sign_ioctl *p9;
-        t_UBSEC_dsa_verify_ioctl *p10;
-#endif
-        t_UBSEC_math_accelerate_ioctl *p11;
-        t_UBSEC_rng_ioctl *p12;
-        t_UBSEC_max_key_len_ioctl *p13;
-        int fd = 0;
-
-        if(ubsec_dso != NULL)
-                {
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_ALREADY_LOADED);
-                goto err;
-                }
-        /* 
-         * Attempt to load libubsec.so/ubsec.dll/whatever. 
-         */
-        ubsec_dso = DSO_load(NULL, get_UBSEC_LIBNAME(), NULL, 0);
-        if(ubsec_dso == NULL)
-                {
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_DSO_FAILURE);
-                goto err;
-                }
-
-        if (
-        !(p1 = (t_UBSEC_ubsec_bytes_to_bits *) DSO_bind_func(ubsec_dso, UBSEC_F1)) ||
-        !(p2 = (t_UBSEC_ubsec_bits_to_bytes *) DSO_bind_func(ubsec_dso, UBSEC_F2)) ||
-        !(p3 = (t_UBSEC_ubsec_open *) DSO_bind_func(ubsec_dso, UBSEC_F3)) ||
-        !(p4 = (t_UBSEC_ubsec_close *) DSO_bind_func(ubsec_dso, UBSEC_F4)) ||
-#ifndef OPENSSL_NO_DH
-        !(p5 = (t_UBSEC_diffie_hellman_generate_ioctl *) 
-                                DSO_bind_func(ubsec_dso, UBSEC_F5)) ||
-        !(p6 = (t_UBSEC_diffie_hellman_agree_ioctl *) 
-                                DSO_bind_func(ubsec_dso, UBSEC_F6)) ||
-#endif
-/* #ifndef OPENSSL_NO_RSA */
-        !(p7 = (t_UBSEC_rsa_mod_exp_ioctl *) DSO_bind_func(ubsec_dso, UBSEC_F7)) ||
-        !(p8 = (t_UBSEC_rsa_mod_exp_crt_ioctl *) DSO_bind_func(ubsec_dso, UBSEC_F8)) ||
-/* #endif */
-#ifndef OPENSSL_NO_DSA
-        !(p9 = (t_UBSEC_dsa_sign_ioctl *) DSO_bind_func(ubsec_dso, UBSEC_F9)) ||
-        !(p10 = (t_UBSEC_dsa_verify_ioctl *) DSO_bind_func(ubsec_dso, UBSEC_F10)) ||
-#endif
-        !(p11 = (t_UBSEC_math_accelerate_ioctl *) 
-                                DSO_bind_func(ubsec_dso, UBSEC_F11)) ||
-        !(p12 = (t_UBSEC_rng_ioctl *) DSO_bind_func(ubsec_dso, UBSEC_F12)) ||
-        !(p13 = (t_UBSEC_max_key_len_ioctl *) DSO_bind_func(ubsec_dso, UBSEC_F13)))
-                {
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_DSO_FAILURE);
-                goto err;
-                }
-
-        /* Copy the pointers */
-        p_UBSEC_ubsec_bytes_to_bits = p1;
-        p_UBSEC_ubsec_bits_to_bytes = p2;
-        p_UBSEC_ubsec_open = p3;
-        p_UBSEC_ubsec_close = p4;
-#ifndef OPENSSL_NO_DH
-        p_UBSEC_diffie_hellman_generate_ioctl = p5;
-        p_UBSEC_diffie_hellman_agree_ioctl = p6;
-#endif
-#ifndef OPENSSL_NO_RSA
-        p_UBSEC_rsa_mod_exp_ioctl = p7;
-        p_UBSEC_rsa_mod_exp_crt_ioctl = p8;
-#endif
-#ifndef OPENSSL_NO_DSA
-        p_UBSEC_dsa_sign_ioctl = p9;
-        p_UBSEC_dsa_verify_ioctl = p10;
-#endif
-        p_UBSEC_math_accelerate_ioctl = p11;
-        p_UBSEC_rng_ioctl = p12;
-        p_UBSEC_max_key_len_ioctl = p13;
-
-        /* Perform an open to see if there's actually any unit running. */
-        if (((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) > 0) && (p_UBSEC_max_key_len_ioctl(fd, &max_key_len) == 0))
-        {
-           p_UBSEC_ubsec_close(fd);
-           return 1;
-        }
-        else
-        {
-          UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-        }
-
-err:
-        if(ubsec_dso)
-                DSO_free(ubsec_dso);
-        ubsec_dso = NULL;
-        p_UBSEC_ubsec_bytes_to_bits = NULL;
-        p_UBSEC_ubsec_bits_to_bytes = NULL;
-        p_UBSEC_ubsec_open = NULL;
-        p_UBSEC_ubsec_close = NULL;
-#ifndef OPENSSL_NO_DH
-        p_UBSEC_diffie_hellman_generate_ioctl = NULL;
-        p_UBSEC_diffie_hellman_agree_ioctl = NULL;
-#endif
-#ifndef OPENSSL_NO_RSA
-        p_UBSEC_rsa_mod_exp_ioctl = NULL;
-        p_UBSEC_rsa_mod_exp_crt_ioctl = NULL;
-#endif
-#ifndef OPENSSL_NO_DSA
-        p_UBSEC_dsa_sign_ioctl = NULL;
-        p_UBSEC_dsa_verify_ioctl = NULL;
-#endif
-        p_UBSEC_math_accelerate_ioctl = NULL;
-        p_UBSEC_rng_ioctl = NULL;
-        p_UBSEC_max_key_len_ioctl = NULL;
-
-        return 0;
-        }
-
-static int ubsec_finish(ENGINE *e)
-        {
-        free_UBSEC_LIBNAME();
-        if(ubsec_dso == NULL)
-                {
-                UBSECerr(UBSEC_F_UBSEC_FINISH, UBSEC_R_NOT_LOADED);
-                return 0;
-                }
-        if(!DSO_free(ubsec_dso))
-                {
-                UBSECerr(UBSEC_F_UBSEC_FINISH, UBSEC_R_DSO_FAILURE);
-                return 0;
-                }
-        ubsec_dso = NULL;
-        p_UBSEC_ubsec_bytes_to_bits = NULL;
-        p_UBSEC_ubsec_bits_to_bytes = NULL;
-        p_UBSEC_ubsec_open = NULL;
-        p_UBSEC_ubsec_close = NULL;
-#ifndef OPENSSL_NO_DH
-        p_UBSEC_diffie_hellman_generate_ioctl = NULL;
-        p_UBSEC_diffie_hellman_agree_ioctl = NULL;
-#endif
-#ifndef OPENSSL_NO_RSA
-        p_UBSEC_rsa_mod_exp_ioctl = NULL;
-        p_UBSEC_rsa_mod_exp_crt_ioctl = NULL;
-#endif
-#ifndef OPENSSL_NO_DSA
-        p_UBSEC_dsa_sign_ioctl = NULL;
-        p_UBSEC_dsa_verify_ioctl = NULL;
-#endif
-        p_UBSEC_math_accelerate_ioctl = NULL;
-        p_UBSEC_rng_ioctl = NULL;
-        p_UBSEC_max_key_len_ioctl = NULL;
-        return 1;
-        }
-
-static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-        {
-        int initialised = ((ubsec_dso == NULL) ? 0 : 1);
-        switch(cmd)
-                {
-        case UBSEC_CMD_SO_PATH:
-                if(p == NULL)
-                        {
-                        UBSECerr(UBSEC_F_UBSEC_CTRL,ERR_R_PASSED_NULL_PARAMETER);
-                        return 0;
-                        }
-                if(initialised)
-                        {
-                        UBSECerr(UBSEC_F_UBSEC_CTRL,UBSEC_R_ALREADY_LOADED);
-                        return 0;
-                        }
-                return set_UBSEC_LIBNAME((const char *)p);
-        default:
-                break;
-                }
-        UBSECerr(UBSEC_F_UBSEC_CTRL,UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED);
-        return 0;
-        }
-
-static int ubsec_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx)
-        {
-        int     y_len = 0;
-        int     fd;
-
-        if(ubsec_dso == NULL)
-        {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_NOT_LOADED);
-                return 0;
-        }
-
-        /* Check if hardware can't handle this argument. */
-        y_len = BN_num_bits(m);
-        if (y_len > max_key_len) {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                return BN_mod_exp(r, a, p, m, ctx);
-        } 
-
-        if(!bn_wexpand(r, m->top))
-        {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_BN_EXPAND_FAIL);
-                return 0;
-        }
-
-        if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
-                fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-                return BN_mod_exp(r, a, p, m, ctx);
-        }
-
-        if (p_UBSEC_rsa_mod_exp_ioctl(fd, (unsigned char *)a->d, BN_num_bits(a),
-                (unsigned char *)m->d, BN_num_bits(m), (unsigned char *)p->d, 
-                BN_num_bits(p), (unsigned char *)r->d, &y_len) != 0)
-        {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_REQUEST_FAILED);
-                p_UBSEC_ubsec_close(fd);
-
-                return BN_mod_exp(r, a, p, m, ctx);
-        }
-
-        p_UBSEC_ubsec_close(fd);
-
-        r->top = (BN_num_bits(m)+BN_BITS2-1)/BN_BITS2;
-        return 1;
-        }
-
-#ifndef OPENSSL_NO_RSA
-static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-        {
-        BN_CTX *ctx;
-        int to_return = 0;
-
-        if((ctx = BN_CTX_new()) == NULL)
-                goto err;
-
-        if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
-                {
-                UBSECerr(UBSEC_F_UBSEC_RSA_MOD_EXP, UBSEC_R_MISSING_KEY_COMPONENTS);
-                goto err;
-                }
-
-        to_return = ubsec_mod_exp_crt(r0, I, rsa->p, rsa->q, rsa->dmp1,
-                    rsa->dmq1, rsa->iqmp, ctx);
-        if (to_return == FAIL_TO_SOFTWARE)
-        {
-          /*
-           * Do in software as hardware failed.
-           */
-           const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-           to_return = (*meth->rsa_mod_exp)(r0, I, rsa);
-        }
-err:
-        if(ctx)
-                BN_CTX_free(ctx);
-        return to_return;
-        }
-#endif
-
-static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *q, const BIGNUM *dp,
-                        const BIGNUM *dq, const BIGNUM *qinv, BN_CTX *ctx)
-        {
-        int     y_len,
-                m_len,
-                fd;
-
-        m_len = BN_num_bytes(p) + BN_num_bytes(q) + 1;
-        y_len = BN_num_bits(p) + BN_num_bits(q);
-
-        /* Check if hardware can't handle this argument. */
-        if (y_len > max_key_len) {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
-                return FAIL_TO_SOFTWARE;
-        } 
-
-        if (!bn_wexpand(r, p->top + q->top + 1)) {
-                UBSECerr(UBSEC_F_UBSEC_RSA_MOD_EXP_CRT, UBSEC_R_BN_EXPAND_FAIL);
-                return 0;
-        }
-
-        if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
-                fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-                return FAIL_TO_SOFTWARE;
-        }
-
-        if (p_UBSEC_rsa_mod_exp_crt_ioctl(fd,
-                (unsigned char *)a->d, BN_num_bits(a), 
-                (unsigned char *)qinv->d, BN_num_bits(qinv),
-                (unsigned char *)dp->d, BN_num_bits(dp),
-                (unsigned char *)p->d, BN_num_bits(p),
-                (unsigned char *)dq->d, BN_num_bits(dq),
-                (unsigned char *)q->d, BN_num_bits(q),
-                (unsigned char *)r->d,  &y_len) != 0) {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_REQUEST_FAILED);
-                p_UBSEC_ubsec_close(fd);
-                return FAIL_TO_SOFTWARE;
-        }
-
-        p_UBSEC_ubsec_close(fd);
-
-        r->top = (BN_num_bits(p) + BN_num_bits(q) + BN_BITS2 - 1)/BN_BITS2;
-        return 1;
-}
-
-#ifndef OPENSSL_NO_DSA
-#ifdef NOT_USED
-static int ubsec_dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1,
-                BIGNUM *p1, BIGNUM *a2, BIGNUM *p2, BIGNUM *m,
-                BN_CTX *ctx, BN_MONT_CTX *in_mont)
-        {
-        BIGNUM t;
-        int to_return = 0;
- 
-        BN_init(&t);
-        /* let rr = a1 ^ p1 mod m */
-        if (!ubsec_mod_exp(rr,a1,p1,m,ctx)) goto end;
-        /* let t = a2 ^ p2 mod m */
-        if (!ubsec_mod_exp(&t,a2,p2,m,ctx)) goto end;
-        /* let rr = rr * t mod m */
-        if (!BN_mod_mul(rr,rr,&t,m,ctx)) goto end;
-        to_return = 1;
-end:
-        BN_free(&t);
-        return to_return;
-        }
-
-static int ubsec_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
-                const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *m_ctx)
-        {
-        return ubsec_mod_exp(r, a, p, m, ctx);
-        }
-#endif
-#endif
-
-/*
- * This function is aliased to mod_exp (with the mont stuff dropped).
- */
-static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-        {
-        int ret = 0;
-
-#ifndef OPENSSL_NO_RSA
-        /* Do in software if the key is too large for the hardware. */
-        if (BN_num_bits(m) > max_key_len)
-                {
-                const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-                ret = (*meth->bn_mod_exp)(r, a, p, m, ctx, m_ctx);
-                }
-        else
-#endif
-                {
-                ret = ubsec_mod_exp(r, a, p, m, ctx);
-                }
-        
-        return ret;
-        }
-
-#ifndef OPENSSL_NO_DH
-/* This function is aliased to mod_exp (with the dh and mont dropped). */
-static int ubsec_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-                const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *m_ctx)
-        {
-        return ubsec_mod_exp(r, a, p, m, ctx);
-        }
-#endif
-
-#ifndef OPENSSL_NO_DSA
-static DSA_SIG *ubsec_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
-        {
-        DSA_SIG *to_return = NULL;
-        int s_len = 160, r_len = 160, d_len, fd;
-        BIGNUM m, *r=NULL, *s=NULL;
-
-        BN_init(&m);
-
-        s = BN_new();
-        r = BN_new();
-        if ((s == NULL) || (r==NULL))
-                goto err;
-
-        d_len = p_UBSEC_ubsec_bytes_to_bits((unsigned char *)dgst, dlen);
-
-        if(!bn_wexpand(r, (160+BN_BITS2-1)/BN_BITS2) ||
-           (!bn_wexpand(s, (160+BN_BITS2-1)/BN_BITS2))) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_BN_EXPAND_FAIL);
-                goto err;
-        }
-
-        if (BN_bin2bn(dgst,dlen,&m) == NULL) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_BN_EXPAND_FAIL);
-                goto err;
-        } 
-
-        if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
-                const DSA_METHOD *meth;
-                fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-                meth = DSA_OpenSSL();
-                to_return =  meth->dsa_do_sign(dgst, dlen, dsa);
-                goto err;
-        }
-
-        if (p_UBSEC_dsa_sign_ioctl(fd, 0, /* compute hash before signing */
-                (unsigned char *)dgst, d_len,
-                NULL, 0,  /* compute random value */
-                (unsigned char *)dsa->p->d, BN_num_bits(dsa->p), 
-                (unsigned char *)dsa->q->d, BN_num_bits(dsa->q),
-                (unsigned char *)dsa->g->d, BN_num_bits(dsa->g),
-                (unsigned char *)dsa->priv_key->d, BN_num_bits(dsa->priv_key),
-                (unsigned char *)r->d, &r_len,
-                (unsigned char *)s->d, &s_len ) != 0) {
-                const DSA_METHOD *meth;
-
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_REQUEST_FAILED);
-                p_UBSEC_ubsec_close(fd);
-                meth = DSA_OpenSSL();
-                to_return = meth->dsa_do_sign(dgst, dlen, dsa);
-
-                goto err;
-        }
-
-        p_UBSEC_ubsec_close(fd);
-
-        r->top = (160+BN_BITS2-1)/BN_BITS2;
-        s->top = (160+BN_BITS2-1)/BN_BITS2;
-
-        to_return = DSA_SIG_new();
-        if(to_return == NULL) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_BN_EXPAND_FAIL);
-                goto err;
-        }
-
-        to_return->r = r;
-        to_return->s = s;
-
-err:
-        if (!to_return) {
-                if (r) BN_free(r);
-                if (s) BN_free(s);
-        }                                 
-        BN_clear_free(&m);
-        return to_return;
-}
-
-static int ubsec_dsa_verify(const unsigned char *dgst, int dgst_len,
-                                DSA_SIG *sig, DSA *dsa)
-        {
-        int v_len, d_len;
-        int to_return = 0;
-        int fd;
-        BIGNUM v;
-
-        BN_init(&v);
-
-        if(!bn_wexpand(&v, dsa->p->top)) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_VERIFY ,UBSEC_R_BN_EXPAND_FAIL);
-                goto err;
-        }
-
-        v_len = BN_num_bits(dsa->p);
-
-        d_len = p_UBSEC_ubsec_bytes_to_bits((unsigned char *)dgst, dgst_len);
-
-        if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
-                const DSA_METHOD *meth;
-                fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-                meth = DSA_OpenSSL();
-                to_return = meth->dsa_do_verify(dgst, dgst_len, sig, dsa);
-                goto err;
-        }
-
-        if (p_UBSEC_dsa_verify_ioctl(fd, 0, /* compute hash before signing */
-                (unsigned char *)dgst, d_len,
-                (unsigned char *)dsa->p->d, BN_num_bits(dsa->p), 
-                (unsigned char *)dsa->q->d, BN_num_bits(dsa->q),
-                (unsigned char *)dsa->g->d, BN_num_bits(dsa->g),
-                (unsigned char *)dsa->pub_key->d, BN_num_bits(dsa->pub_key),
-                (unsigned char *)sig->r->d, BN_num_bits(sig->r),
-                (unsigned char *)sig->s->d, BN_num_bits(sig->s),
-                (unsigned char *)v.d, &v_len) != 0) {
-                const DSA_METHOD *meth;
-                UBSECerr(UBSEC_F_UBSEC_DSA_VERIFY , UBSEC_R_REQUEST_FAILED);
-                p_UBSEC_ubsec_close(fd);
-
-                meth = DSA_OpenSSL();
-                to_return = meth->dsa_do_verify(dgst, dgst_len, sig, dsa);
-
-                goto err;
-        }
-
-        p_UBSEC_ubsec_close(fd);
-
-        to_return = 1;
-err:
-        BN_clear_free(&v);
-        return to_return;
-        }
-#endif
-
-#ifndef OPENSSL_NO_DH
-static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh)
-        {
-        int      ret      = -1,
-                 k_len,
-                 fd;
-
-        k_len = BN_num_bits(dh->p);
-
-        if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
-                {
-                const DH_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-                meth = DH_OpenSSL();
-                ret = meth->compute_key(key, pub_key, dh);
-                goto err;
-                }
-
-        if (p_UBSEC_diffie_hellman_agree_ioctl(fd,
-                                               (unsigned char *)dh->priv_key->d, BN_num_bits(dh->priv_key),
-                                               (unsigned char *)pub_key->d, BN_num_bits(pub_key),
-                                               (unsigned char *)dh->p->d, BN_num_bits(dh->p),
-                                               key, &k_len) != 0)
-                {
-                /* Hardware's a no go, failover to software */
-                const DH_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_REQUEST_FAILED);
-                p_UBSEC_ubsec_close(fd);
-
-                meth = DH_OpenSSL();
-                ret = meth->compute_key(key, pub_key, dh);
-
-                goto err;
-                }
-
-        p_UBSEC_ubsec_close(fd);
-
-        ret = p_UBSEC_ubsec_bits_to_bytes(k_len);
-err:
-        return ret;
-        }
-
-static int ubsec_dh_generate_key (DH *dh)
-        {
-        int      ret               = 0,
-                 random_bits       = 0,
-                 pub_key_len       = 0,
-                 priv_key_len      = 0,
-                 fd;
-        BIGNUM   *pub_key          = NULL;
-        BIGNUM   *priv_key         = NULL;
-
-        /* 
-         *  How many bits should Random x be? dh_key.c
-         *  sets the range from 0 to num_bits(modulus) ???
-         */
-
-        if (dh->priv_key == NULL)
-                {
-                priv_key = BN_new();
-                if (priv_key == NULL) goto err;
-                priv_key_len = BN_num_bits(dh->p);
-                bn_wexpand(priv_key, dh->p->top);
-                do
-                        if (!BN_rand_range(priv_key, dh->p)) goto err;
-                while (BN_is_zero(priv_key));
-                random_bits = BN_num_bits(priv_key);
-                }
-        else
-                {
-                priv_key = dh->priv_key;
-                }
-
-        if (dh->pub_key == NULL)
-                {
-                pub_key = BN_new();
-                pub_key_len = BN_num_bits(dh->p);
-                bn_wexpand(pub_key, dh->p->top);
-                if(pub_key == NULL) goto err;
-                }
-        else
-                {
-                pub_key = dh->pub_key;
-                }
-
-        if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
-                {
-                const DH_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-                meth = DH_OpenSSL();
-                ret = meth->generate_key(dh);
-                goto err;
-                }
-
-        if (p_UBSEC_diffie_hellman_generate_ioctl(fd,
-                                                  (unsigned char *)priv_key->d, &priv_key_len,
-                                                  (unsigned char *)pub_key->d,  &pub_key_len,
-                                                  (unsigned char *)dh->g->d, BN_num_bits(dh->g),
-                                                  (unsigned char *)dh->p->d, BN_num_bits(dh->p),
-                                                  0, 0, random_bits) != 0)
-                {
-                /* Hardware's a no go, failover to software */
-                const DH_METHOD *meth;
-
-                ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_REQUEST_FAILED);
-                p_UBSEC_ubsec_close(fd);
-
-                meth = DH_OpenSSL();
-                ret = meth->generate_key(dh);
-
-                goto err;
-                }
-
-        p_UBSEC_ubsec_close(fd);
-
-        dh->pub_key = pub_key;
-        dh->pub_key->top = (pub_key_len + BN_BITS2-1) / BN_BITS2;
-        dh->priv_key = priv_key;
-        dh->priv_key->top = (priv_key_len + BN_BITS2-1) / BN_BITS2;
-
-        ret = 1;
-err:
-        return ret;
-        }
-#endif
-
-#ifdef NOT_USED
-static int ubsec_rand_bytes(unsigned char * buf,
-                            int num)
-        {
-        int      ret      = 0,
-                 fd;
-
-        if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
-                {
-                const RAND_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
-                num = p_UBSEC_ubsec_bits_to_bytes(num);
-                meth = RAND_SSLeay();
-                meth->seed(buf, num);
-                ret = meth->bytes(buf, num);
-                goto err;
-                }
-
-        num *= 8; /* bytes to bits */
-
-        if (p_UBSEC_rng_ioctl(fd,
-                              UBSEC_RNG_DIRECT,
-                              buf,
-                              &num) != 0)
-                {
-                /* Hardware's a no go, failover to software */
-                const RAND_METHOD *meth;
-
-                ENGINEerr(UBSEC_F_UBSEC_RNG_BYTES, UBSEC_R_REQUEST_FAILED);
-                p_UBSEC_ubsec_close(fd);
-
-                num = p_UBSEC_ubsec_bits_to_bytes(num);
-                meth = RAND_SSLeay();
-                meth->seed(buf, num);
-                ret = meth->bytes(buf, num);
-
-                goto err;
-                }
-
-        p_UBSEC_ubsec_close(fd);
-
-        ret = 1;
-err:
-        return(ret);
-        }
-
-
-static int ubsec_rand_status(void)
-        {
-        return 0;
-        }
-#endif
-
-/* This stuff is needed if this ENGINE is being compiled into a self-contained
- * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
-static int bind_fn(ENGINE *e, const char *id)
-        {
-        if(id && (strcmp(id, engine_ubsec_id) != 0))
-                return 0;
-        if(!bind_helper(e))
-                return 0;
-        return 1;
-        }
-IMPLEMENT_DYNAMIC_CHECK_FN()
-IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
-
-#endif /* !OPENSSL_NO_HW_UBSEC */
-#endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/vendor_defns/sureware.h b/src/lib/libcrypto/engine/vendor_defns/sureware.h
deleted file mode 100644
index 4bc22027f9..0000000000
--- a/src/lib/libcrypto/engine/vendor_defns/sureware.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-* Written by Corinne Dive-Reclus(cdive@baltimore.com)
-*
-* Copyright@2001 Baltimore Technologies Ltd.
-*                                                                                                                                                                                               *       
-*               THIS FILE IS PROVIDED BY BALTIMORE TECHNOLOGIES ``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 BALTIMORE TECHNOLOGIES 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.                                                                                                                                                    *
-*
-* 
-*/
-#ifdef WIN32
-#define SW_EXPORT       __declspec ( dllexport )
-#else
-#define SW_EXPORT
-#endif
-
-/*
-*       List of exposed SureWare errors
-*/
-#define SUREWAREHOOK_ERROR_FAILED               -1
-#define SUREWAREHOOK_ERROR_FALLBACK             -2
-#define SUREWAREHOOK_ERROR_UNIT_FAILURE -3
-#define SUREWAREHOOK_ERROR_DATA_SIZE -4
-#define SUREWAREHOOK_ERROR_INVALID_PAD -5
-/*
-* -----------------WARNING-----------------------------------
-* In all the following functions:
-* msg is a string with at least 24 bytes free.
-* A 24 bytes string will be concatenated to the existing content of msg. 
-*/
-/*
-*       SureWare Initialisation function
-*       in param threadsafe, if !=0, thread safe enabled
-*       return SureWareHOOK_ERROR_UNIT_FAILURE if failure, 1 if success
-*/
-typedef int SureWareHook_Init_t(char*const msg,int threadsafe);
-extern SW_EXPORT SureWareHook_Init_t SureWareHook_Init;
-/*
-*       SureWare Finish function
-*/
-typedef void SureWareHook_Finish_t();
-extern SW_EXPORT SureWareHook_Finish_t SureWareHook_Finish;
-/*
-*        PRE_CONDITION:
-*               DO NOT CALL ANY OF THE FOLLOWING FUNCTIONS IN CASE OF INIT FAILURE
-*/
-/*
-*       SureWare RAND Bytes function
-*       In case of failure, the content of buf is unpredictable.
-*       return 1 if success
-*                       SureWareHOOK_ERROR_FALLBACK if function not available in hardware
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*                       SureWareHOOK_ERROR_UNIT_FAILURE if hardware failure
-*                       SUREWAREHOOK_ERROR_DATA_SIZE wrong size for buf
-*
-*       in/out param buf : a num bytes long buffer where random bytes will be put
-*       in param num : the number of bytes into buf
-*/
-typedef int SureWareHook_Rand_Bytes_t(char*const msg,unsigned char *buf, int num);
-extern SW_EXPORT SureWareHook_Rand_Bytes_t SureWareHook_Rand_Bytes;
-
-/*
-*       SureWare RAND Seed function
-*       Adds some seed to the Hardware Random Number Generator
-*       return 1 if success
-*                       SureWareHOOK_ERROR_FALLBACK if function not available in hardware
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*                       SureWareHOOK_ERROR_UNIT_FAILURE if hardware failure
-*                       SUREWAREHOOK_ERROR_DATA_SIZE wrong size for buf
-*
-*       in param buf : the seed to add into the HRNG
-*       in param num : the number of bytes into buf
-*/
-typedef int SureWareHook_Rand_Seed_t(char*const msg,const void *buf, int num);
-extern SW_EXPORT SureWareHook_Rand_Seed_t SureWareHook_Rand_Seed;
-
-/*
-*       SureWare Load Private Key function
-*       return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*       No hardware is contact for this function.
-*
-*       in param key_id :the name of the private protected key file without the extension
-                                                ".sws"
-*       out param hptr : a pointer to a buffer allocated by SureWare_Hook
-*       out param num: the effective key length in bytes
-*       out param keytype: 1 if RSA 2 if DSA
-*/
-typedef int SureWareHook_Load_Privkey_t(char*const msg,const char *key_id,char **hptr,unsigned long *num,char *keytype);
-extern SW_EXPORT SureWareHook_Load_Privkey_t SureWareHook_Load_Privkey;
-
-/*
-*       SureWare Info Public Key function
-*       return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*       No hardware is contact for this function.
-*
-*       in param key_id :the name of the private protected key file without the extension
-                                                ".swp"
-*       out param hptr : a pointer to a buffer allocated by SureWare_Hook
-*       out param num: the effective key length in bytes
-*       out param keytype: 1 if RSA 2 if DSA
-*/
-typedef int SureWareHook_Info_Pubkey_t(char*const msg,const char *key_id,unsigned long *num,
-                                                                                char *keytype);
-extern SW_EXPORT SureWareHook_Info_Pubkey_t SureWareHook_Info_Pubkey;
-
-/*
-*       SureWare Load Public Key function
-*       return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*       No hardware is contact for this function.
-*
-*       in param key_id :the name of the public protected key file without the extension
-                                                ".swp"
-*       in param num : the bytes size of n and e
-*       out param n: where to write modulus in bn format
-*       out param e: where to write exponent in bn format
-*/
-typedef int SureWareHook_Load_Rsa_Pubkey_t(char*const msg,const char *key_id,unsigned long num,
-                                                                                unsigned long *n, unsigned long *e);
-extern SW_EXPORT SureWareHook_Load_Rsa_Pubkey_t SureWareHook_Load_Rsa_Pubkey;
-
-/*
-*       SureWare Load DSA Public Key function
-*       return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*       No hardware is contact for this function.
-*
-*       in param key_id :the name of the public protected key file without the extension
-                                                ".swp"
-*       in param num : the bytes size of n and e
-*       out param pub: where to write pub key in bn format
-*       out param p: where to write prime in bn format
-*       out param q: where to write sunprime (length 20 bytes) in bn format
-*       out param g: where to write base in bn format
-*/
-typedef int SureWareHook_Load_Dsa_Pubkey_t(char*const msg,const char *key_id,unsigned long num,
-                                                                                unsigned long *pub, unsigned long *p,unsigned long*q,
-                                                                                unsigned long *g);
-extern SW_EXPORT SureWareHook_Load_Dsa_Pubkey_t SureWareHook_Load_Dsa_Pubkey;
-
-/*
-*       SureWare Free function
-*       Destroy the key into the hardware if destroy==1
-*/
-typedef void SureWareHook_Free_t(char *p,int destroy);
-extern SW_EXPORT SureWareHook_Free_t SureWareHook_Free;
-
-#define SUREWARE_PKCS1_PAD 1
-#define SUREWARE_ISO9796_PAD 2
-#define SUREWARE_NO_PAD 0
-/*
-* SureWare RSA Private Decryption
-* return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*                       SureWareHOOK_ERROR_UNIT_FAILURE if hardware failure
-*                       SUREWAREHOOK_ERROR_DATA_SIZE wrong size for buf
-*
-*       in param flen : byte size of from and to
-*       in param from : encrypted data buffer, should be a not-null valid pointer
-*       out param tlen: byte size of decrypted data, if error, unexpected value
-*       out param to : decrypted data buffer, should be a not-null valid pointer
-*   in param prsa: a protected key pointer, should be a not-null valid pointer
-*   int padding: padding id as follow
-*                                       SUREWARE_PKCS1_PAD
-*                                       SUREWARE_NO_PAD
-*
-*/
-typedef int SureWareHook_Rsa_Priv_Dec_t(char*const msg,int flen,unsigned char *from,
-                                                                                int *tlen,unsigned char *to,
-                                                                                char *prsa,int padding);
-extern SW_EXPORT SureWareHook_Rsa_Priv_Dec_t SureWareHook_Rsa_Priv_Dec;
-/*
-* SureWare RSA Signature
-* return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*                       SureWareHOOK_ERROR_UNIT_FAILURE if hardware failure
-*                       SUREWAREHOOK_ERROR_DATA_SIZE wrong size for buf
-*
-*       in param flen : byte size of from and to
-*       in param from : encrypted data buffer, should be a not-null valid pointer
-*       out param tlen: byte size of decrypted data, if error, unexpected value
-*       out param to : decrypted data buffer, should be a not-null valid pointer
-*   in param prsa: a protected key pointer, should be a not-null valid pointer
-*   int padding: padding id as follow
-*                                       SUREWARE_PKCS1_PAD
-*                                       SUREWARE_ISO9796_PAD
-*
-*/
-typedef int SureWareHook_Rsa_Sign_t(char*const msg,int flen,unsigned char *from,
-                                                                                int *tlen,unsigned char *to,
-                                                                                char *prsa,int padding);
-extern SW_EXPORT SureWareHook_Rsa_Sign_t SureWareHook_Rsa_Sign;
-/*
-* SureWare DSA Signature
-* return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*                       SureWareHOOK_ERROR_UNIT_FAILURE if hardware failure
-*                       SUREWAREHOOK_ERROR_DATA_SIZE wrong size for buf
-*
-*       in param flen : byte size of from and to
-*       in param from : encrypted data buffer, should be a not-null valid pointer
-*       out param to : decrypted data buffer, should be a 40bytes valid pointer
-*   in param pdsa: a protected key pointer, should be a not-null valid pointer
-*
-*/
-typedef int SureWareHook_Dsa_Sign_t(char*const msg,int flen,const unsigned char *from,
-                                                                                unsigned long *r,unsigned long *s,char *pdsa);
-extern SW_EXPORT SureWareHook_Dsa_Sign_t SureWareHook_Dsa_Sign;
-
-
-/*
-* SureWare Mod Exp
-* return 1 if success
-*                       SureWareHOOK_ERROR_FAILED if error while processing
-*                       SureWareHOOK_ERROR_UNIT_FAILURE if hardware failure
-*                       SUREWAREHOOK_ERROR_DATA_SIZE wrong size for buf
-*
-*       mod and res are mlen bytes long.
-*       exp is elen bytes long
-*       data is dlen bytes long
-*       mlen,elen and dlen are all multiple of sizeof(unsigned long)
-*/
-typedef int SureWareHook_Mod_Exp_t(char*const msg,int mlen,const unsigned long *mod,
-                                                                        int elen,const unsigned long *exponent,
-                                                                        int dlen,unsigned long *data,
-                                                                        unsigned long *res);
-extern SW_EXPORT SureWareHook_Mod_Exp_t SureWareHook_Mod_Exp;
-
diff --git a/src/lib/libcrypto/err/err_def.c b/src/lib/libcrypto/err/err_def.c
deleted file mode 100644
index 7ed3d84955..0000000000
--- a/src/lib/libcrypto/err/err_def.c
+++ /dev/null
@@ -1,665 +0,0 @@
-/* crypto/err/err_def.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/crypto.h>
-#include <openssl/buffer.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-
-#define err_clear_data(p,i) \
-        do { \
-        if (((p)->err_data[i] != NULL) && \
-                (p)->err_data_flags[i] & ERR_TXT_MALLOCED) \
-                {  \
-                OPENSSL_free((p)->err_data[i]); \
-                (p)->err_data[i]=NULL; \
-                } \
-        (p)->err_data_flags[i]=0; \
-        } while(0)
-
-#define err_clear(p,i) \
-        do { \
-        (p)->err_flags[i]=0; \
-        (p)->err_buffer[i]=0; \
-        err_clear_data(p,i); \
-        (p)->err_file[i]=NULL; \
-        (p)->err_line[i]= -1; \
-        } while(0)
-
-static void err_load_strings(int lib, ERR_STRING_DATA *str);
-
-static void ERR_STATE_free(ERR_STATE *s);
-
-/* Define the predeclared (but externally opaque) "ERR_FNS" type */
-struct st_ERR_FNS
-        {
-        /* Works on the "error_hash" string table */
-        LHASH *(*cb_err_get)(int create);
-        void (*cb_err_del)(void);
-        ERR_STRING_DATA *(*cb_err_get_item)(const ERR_STRING_DATA *);
-        ERR_STRING_DATA *(*cb_err_set_item)(ERR_STRING_DATA *);
-        ERR_STRING_DATA *(*cb_err_del_item)(ERR_STRING_DATA *);
-        /* Works on the "thread_hash" error-state table */
-        LHASH *(*cb_thread_get)(int create);
-        void (*cb_thread_release)(LHASH **hash);
-        ERR_STATE *(*cb_thread_get_item)(const ERR_STATE *);
-        ERR_STATE *(*cb_thread_set_item)(ERR_STATE *);
-        void (*cb_thread_del_item)(const ERR_STATE *);
-        /* Returns the next available error "library" numbers */
-        int (*cb_get_next_lib)(void);
-        };
-
-/* Predeclarations of the "err_defaults" functions */
-static LHASH *int_err_get(int create);
-static void int_err_del(void);
-static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *);
-static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *);
-static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *);
-static LHASH *int_thread_get(int create);
-static void int_thread_release(LHASH **hash);
-static ERR_STATE *int_thread_get_item(const ERR_STATE *);
-static ERR_STATE *int_thread_set_item(ERR_STATE *);
-static void int_thread_del_item(const ERR_STATE *);
-static int int_err_get_next_lib(void);
-/* The static ERR_FNS table using these defaults functions */
-static const ERR_FNS err_defaults =
-        {
-        int_err_get,
-        int_err_del,
-        int_err_get_item,
-        int_err_set_item,
-        int_err_del_item,
-        int_thread_get,
-        int_thread_release,
-        int_thread_get_item,
-        int_thread_set_item,
-        int_thread_del_item,
-        int_err_get_next_lib
-        };
-
-/* The replacable table of ERR_FNS functions we use at run-time */
-static const ERR_FNS *err_fns = NULL;
-
-/* Eg. rather than using "err_get()", use "ERRFN(err_get)()". */
-#define ERRFN(a) err_fns->cb_##a
-
-/* The internal state used by "err_defaults" - as such, the setting, reading,
- * creating, and deleting of this data should only be permitted via the
- * "err_defaults" functions. This way, a linked module can completely defer all
- * ERR state operation (together with requisite locking) to the implementations
- * and state in the loading application. */
-static LHASH *int_error_hash = NULL;
-static LHASH *int_thread_hash = NULL;
-static int int_thread_hash_references = 0;
-static int int_err_library_number= ERR_LIB_USER;
-
-/* Internal function that checks whether "err_fns" is set and if not, sets it to
- * the defaults. */
-static void err_fns_check(void)
-        {
-        if (err_fns) return;
-        
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        if (!err_fns)
-                err_fns = &err_defaults;
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-        }
-
-/* API functions to get or set the underlying ERR functions. */
-
-const ERR_FNS *ERR_get_implementation(void)
-        {
-        err_fns_check();
-        return err_fns;
-        }
-
-int ERR_set_implementation(const ERR_FNS *fns)
-        {
-        int ret = 0;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        /* It's too late if 'err_fns' is non-NULL. BTW: not much point setting
-         * an error is there?! */
-        if (!err_fns)
-                {
-                err_fns = fns;
-                ret = 1;
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-        return ret;
-        }
-
-/* These are the callbacks provided to "lh_new()" when creating the LHASH tables
- * internal to the "err_defaults" implementation. */
-
-/* static unsigned long err_hash(ERR_STRING_DATA *a); */
-static unsigned long err_hash(const void *a_void);
-/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b); */
-static int err_cmp(const void *a_void, const void *b_void);
-/* static unsigned long pid_hash(ERR_STATE *pid); */
-static unsigned long pid_hash(const void *pid_void);
-/* static int pid_cmp(ERR_STATE *a,ERR_STATE *pid); */
-static int pid_cmp(const void *a_void,const void *pid_void);
-
-/* The internal functions used in the "err_defaults" implementation */
-
-static LHASH *int_err_get(int create)
-        {
-        LHASH *ret = NULL;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        if (!int_error_hash && create)
-                {
-                CRYPTO_push_info("int_err_get (err.c)");
-                int_error_hash = lh_new(err_hash, err_cmp);
-                CRYPTO_pop_info();
-                }
-        if (int_error_hash)
-                ret = int_error_hash;
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        return ret;
-        }
-
-static void int_err_del(void)
-        {
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        if (int_error_hash)
-                {
-                lh_free(int_error_hash);
-                int_error_hash = NULL;
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-        }
-
-static ERR_STRING_DATA *int_err_get_item(const ERR_STRING_DATA *d)
-        {
-        ERR_STRING_DATA *p;
-        LHASH *hash;
-
-        err_fns_check();
-        hash = ERRFN(err_get)(0);
-        if (!hash)
-                return NULL;
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-        p = (ERR_STRING_DATA *)lh_retrieve(hash, d);
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-
-        return p;
-        }
-
-static ERR_STRING_DATA *int_err_set_item(ERR_STRING_DATA *d)
-        {
-        ERR_STRING_DATA *p;
-        LHASH *hash;
-
-        err_fns_check();
-        hash = ERRFN(err_get)(1);
-        if (!hash)
-                return NULL;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        p = (ERR_STRING_DATA *)lh_insert(hash, d);
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        return p;
-        }
-
-static ERR_STRING_DATA *int_err_del_item(ERR_STRING_DATA *d)
-        {
-        ERR_STRING_DATA *p;
-        LHASH *hash;
-
-        err_fns_check();
-        hash = ERRFN(err_get)(0);
-        if (!hash)
-                return NULL;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        p = (ERR_STRING_DATA *)lh_delete(hash, d);
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        return p;
-        }
-
-static LHASH *int_thread_get(int create)
-        {
-        LHASH *ret = NULL;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        if (!int_thread_hash && create)
-                {
-                CRYPTO_push_info("int_thread_get (err.c)");
-                int_thread_hash = lh_new(pid_hash, pid_cmp);
-                CRYPTO_pop_info();
-                }
-        if (int_thread_hash)
-                {
-                int_thread_hash_references++;
-                ret = int_thread_hash;
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-        return ret;
-        }
-
-static void int_thread_release(LHASH **hash)
-        {
-        int i;
-
-        if (hash == NULL || *hash == NULL)
-                return;
-
-        i = CRYPTO_add(&int_thread_hash_references, -1, CRYPTO_LOCK_ERR);
-
-#ifdef REF_PRINT
-        fprintf(stderr,"%4d:%s\n",int_thread_hash_references,"ERR");
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"int_thread_release, bad reference count\n");
-                abort(); /* ok */
-                }
-#endif
-        *hash = NULL;
-        }
-
-static ERR_STATE *int_thread_get_item(const ERR_STATE *d)
-        {
-        ERR_STATE *p;
-        LHASH *hash;
-
-        err_fns_check();
-        hash = ERRFN(thread_get)(0);
-        if (!hash)
-                return NULL;
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-        p = (ERR_STATE *)lh_retrieve(hash, d);
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-
-        ERRFN(thread_release)(&hash);
-        return p;
-        }
-
-static ERR_STATE *int_thread_set_item(ERR_STATE *d)
-        {
-        ERR_STATE *p;
-        LHASH *hash;
-
-        err_fns_check();
-        hash = ERRFN(thread_get)(1);
-        if (!hash)
-                return NULL;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        p = (ERR_STATE *)lh_insert(hash, d);
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        ERRFN(thread_release)(&hash);
-        return p;
-        }
-
-static void int_thread_del_item(const ERR_STATE *d)
-        {
-        ERR_STATE *p;
-        LHASH *hash;
-
-        err_fns_check();
-        hash = ERRFN(thread_get)(0);
-        if (!hash)
-                return;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        p = (ERR_STATE *)lh_delete(hash, d);
-        /* make sure we don't leak memory */
-        if (int_thread_hash_references == 1
-                && int_thread_hash && (lh_num_items(int_thread_hash) == 0))
-                {
-                lh_free(int_thread_hash);
-                int_thread_hash = NULL;
-                }
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        ERRFN(thread_release)(&hash);
-        if (p)
-                ERR_STATE_free(p);
-        }
-
-static int int_err_get_next_lib(void)
-        {
-        int ret;
-
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        ret = int_err_library_number++;
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-
-        return ret;
-        }
-
-static void ERR_STATE_free(ERR_STATE *s)
-        {
-        int i;
-
-        if (s == NULL)
-            return;
-
-        for (i=0; i<ERR_NUM_ERRORS; i++)
-                {
-                err_clear_data(s,i);
-                }
-        OPENSSL_free(s);
-        }
-
-static void err_load_strings(int lib, ERR_STRING_DATA *str)
-        {
-        while (str->error)
-                {
-                if (lib)
-                        str->error|=ERR_PACK(lib,0,0);
-                ERRFN(err_set_item)(str);
-                str++;
-                }
-        }
-
-void ERR_load_strings(int lib, ERR_STRING_DATA *str)
-        {
-        err_fns_check();
-        err_load_strings(lib, str);
-        }
-
-void ERR_unload_strings(int lib, ERR_STRING_DATA *str)
-        {
-        while (str->error)
-                {
-                if (lib)
-                        str->error|=ERR_PACK(lib,0,0);
-                ERRFN(err_del_item)(str);
-                str++;
-                }
-        }
-
-void ERR_free_strings(void)
-        {
-        err_fns_check();
-        ERRFN(err_del)();
-        }
-
-LHASH *ERR_get_string_table(void)
-        {
-        err_fns_check();
-        return ERRFN(err_get)(0);
-        }
-
-LHASH *ERR_get_err_state_table(void)
-        {
-        err_fns_check();
-        return ERRFN(thread_get)(0);
-        }
-
-void ERR_release_err_state_table(LHASH **hash)
-        {
-        err_fns_check();
-        ERRFN(thread_release)(hash);
-        }
-
-const char *ERR_lib_error_string(unsigned long e)
-        {
-        ERR_STRING_DATA d,*p;
-        unsigned long l;
-
-        err_fns_check();
-        l=ERR_GET_LIB(e);
-        d.error=ERR_PACK(l,0,0);
-        p=ERRFN(err_get_item)(&d);
-        return((p == NULL)?NULL:p->string);
-        }
-
-const char *ERR_func_error_string(unsigned long e)
-        {
-        ERR_STRING_DATA d,*p;
-        unsigned long l,f;
-
-        err_fns_check();
-        l=ERR_GET_LIB(e);
-        f=ERR_GET_FUNC(e);
-        d.error=ERR_PACK(l,f,0);
-        p=ERRFN(err_get_item)(&d);
-        return((p == NULL)?NULL:p->string);
-        }
-
-const char *ERR_reason_error_string(unsigned long e)
-        {
-        ERR_STRING_DATA d,*p=NULL;
-        unsigned long l,r;
-
-        err_fns_check();
-        l=ERR_GET_LIB(e);
-        r=ERR_GET_REASON(e);
-        d.error=ERR_PACK(l,0,r);
-        p=ERRFN(err_get_item)(&d);
-        if (!p)
-                {
-                d.error=ERR_PACK(0,0,r);
-                p=ERRFN(err_get_item)(&d);
-                }
-        return((p == NULL)?NULL:p->string);
-        }
-
-/* static unsigned long err_hash(ERR_STRING_DATA *a) */
-static unsigned long err_hash(const void *a_void)
-        {
-        unsigned long ret,l;
-
-        l=((const ERR_STRING_DATA *)a_void)->error;
-        ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
-        return(ret^ret%19*13);
-        }
-
-/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */
-static int err_cmp(const void *a_void, const void *b_void)
-        {
-        return((int)(((const ERR_STRING_DATA *)a_void)->error -
-                        ((const ERR_STRING_DATA *)b_void)->error));
-        }
-
-/* static unsigned long pid_hash(ERR_STATE *a) */
-static unsigned long pid_hash(const void *a_void)
-        {
-        return(((const ERR_STATE *)a_void)->pid*13);
-        }
-
-/* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */
-static int pid_cmp(const void *a_void, const void *b_void)
-        {
-        return((int)((long)((const ERR_STATE *)a_void)->pid -
-                        (long)((const ERR_STATE *)b_void)->pid));
-        }
-#ifdef OPENSSL_FIPS
-static void int_err_remove_state(unsigned long pid)
-#else
-void ERR_remove_state(unsigned long pid)
-#endif
-        {
-        ERR_STATE tmp;
-
-        err_fns_check();
-        if (pid == 0)
-                pid=(unsigned long)CRYPTO_thread_id();
-        tmp.pid=pid;
-        /* thread_del_item automatically destroys the LHASH if the number of
-         * items reaches zero. */
-        ERRFN(thread_del_item)(&tmp);
-        }
-
-#ifdef OPENSSL_FIPS
-        static ERR_STATE *int_err_get_state(void)
-#else
-ERR_STATE *ERR_get_state(void)
-#endif
-        {
-        static ERR_STATE fallback;
-        ERR_STATE *ret,tmp,*tmpp=NULL;
-        int i;
-        unsigned long pid;
-
-        err_fns_check();
-        pid=(unsigned long)CRYPTO_thread_id();
-        tmp.pid=pid;
-        ret=ERRFN(thread_get_item)(&tmp);
-
-        /* ret == the error state, if NULL, make a new one */
-        if (ret == NULL)
-                {
-                ret=(ERR_STATE *)OPENSSL_malloc(sizeof(ERR_STATE));
-                if (ret == NULL) return(&fallback);
-                ret->pid=pid;
-                ret->top=0;
-                ret->bottom=0;
-                for (i=0; i<ERR_NUM_ERRORS; i++)
-                        {
-                        ret->err_data[i]=NULL;
-                        ret->err_data_flags[i]=0;
-                        }
-                tmpp = ERRFN(thread_set_item)(ret);
-                /* To check if insertion failed, do a get. */
-                if (ERRFN(thread_get_item)(ret) != ret)
-                        {
-                        ERR_STATE_free(ret); /* could not insert it */
-                        return(&fallback);
-                        }
-                /* If a race occured in this function and we came second, tmpp
-                 * is the first one that we just replaced. */
-                if (tmpp)
-                        ERR_STATE_free(tmpp);
-                }
-        return ret;
-        }
-
-#ifdef OPENSSL_FIPS
-void int_ERR_lib_init(void)
-        {
-        int_ERR_set_state_func(int_err_get_state, int_err_remove_state);
-        }
-#endif
-
-int ERR_get_next_error_library(void)
-        {
-        err_fns_check();
-        return ERRFN(get_next_lib)();
-        }
diff --git a/src/lib/libcrypto/err/err_str.c b/src/lib/libcrypto/err/err_str.c
deleted file mode 100644
index d39040888d..0000000000
--- a/src/lib/libcrypto/err/err_str.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/* crypto/err/err_str.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/crypto.h>
-#include <openssl/buffer.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-
-#ifndef OPENSSL_NO_ERR
-static ERR_STRING_DATA ERR_str_libraries[]=
-        {
-{ERR_PACK(ERR_LIB_NONE,0,0)             ,"unknown library"},
-{ERR_PACK(ERR_LIB_SYS,0,0)              ,"system library"},
-{ERR_PACK(ERR_LIB_BN,0,0)               ,"bignum routines"},
-{ERR_PACK(ERR_LIB_RSA,0,0)              ,"rsa routines"},
-{ERR_PACK(ERR_LIB_DH,0,0)               ,"Diffie-Hellman routines"},
-{ERR_PACK(ERR_LIB_EVP,0,0)              ,"digital envelope routines"},
-{ERR_PACK(ERR_LIB_BUF,0,0)              ,"memory buffer routines"},
-{ERR_PACK(ERR_LIB_OBJ,0,0)              ,"object identifier routines"},
-{ERR_PACK(ERR_LIB_PEM,0,0)              ,"PEM routines"},
-{ERR_PACK(ERR_LIB_DSA,0,0)              ,"dsa routines"},
-{ERR_PACK(ERR_LIB_X509,0,0)             ,"x509 certificate routines"},
-{ERR_PACK(ERR_LIB_ASN1,0,0)             ,"asn1 encoding routines"},
-{ERR_PACK(ERR_LIB_CONF,0,0)             ,"configuration file routines"},
-{ERR_PACK(ERR_LIB_CRYPTO,0,0)           ,"common libcrypto routines"},
-{ERR_PACK(ERR_LIB_EC,0,0)               ,"elliptic curve routines"},
-{ERR_PACK(ERR_LIB_SSL,0,0)              ,"SSL routines"},
-{ERR_PACK(ERR_LIB_BIO,0,0)              ,"BIO routines"},
-{ERR_PACK(ERR_LIB_PKCS7,0,0)            ,"PKCS7 routines"},
-{ERR_PACK(ERR_LIB_X509V3,0,0)           ,"X509 V3 routines"},
-{ERR_PACK(ERR_LIB_PKCS12,0,0)           ,"PKCS12 routines"},
-{ERR_PACK(ERR_LIB_RAND,0,0)             ,"random number generator"},
-{ERR_PACK(ERR_LIB_DSO,0,0)              ,"DSO support routines"},
-{ERR_PACK(ERR_LIB_ENGINE,0,0)           ,"engine routines"},
-{ERR_PACK(ERR_LIB_OCSP,0,0)             ,"OCSP routines"},
-{ERR_PACK(ERR_LIB_FIPS,0,0)             ,"FIPS routines"},
-{ERR_PACK(ERR_LIB_CMS,0,0)              ,"CMS routines"},
-{ERR_PACK(ERR_LIB_JPAKE,0,0)            ,"JPAKE routines"},
-{0,NULL},
-        };
-
-static ERR_STRING_DATA ERR_str_functs[]=
-        {
-        {ERR_PACK(0,SYS_F_FOPEN,0),             "fopen"},
-        {ERR_PACK(0,SYS_F_CONNECT,0),           "connect"},
-        {ERR_PACK(0,SYS_F_GETSERVBYNAME,0),     "getservbyname"},
-        {ERR_PACK(0,SYS_F_SOCKET,0),            "socket"}, 
-        {ERR_PACK(0,SYS_F_IOCTLSOCKET,0),       "ioctlsocket"},
-        {ERR_PACK(0,SYS_F_BIND,0),              "bind"},
-        {ERR_PACK(0,SYS_F_LISTEN,0),            "listen"},
-        {ERR_PACK(0,SYS_F_ACCEPT,0),            "accept"},
-#ifdef OPENSSL_SYS_WINDOWS
-        {ERR_PACK(0,SYS_F_WSASTARTUP,0),        "WSAstartup"},
-#endif
-        {ERR_PACK(0,SYS_F_OPENDIR,0),           "opendir"},
-        {ERR_PACK(0,SYS_F_FREAD,0),             "fread"},
-        {0,NULL},
-        };
-
-static ERR_STRING_DATA ERR_str_reasons[]=
-        {
-{ERR_R_SYS_LIB                          ,"system lib"},
-{ERR_R_BN_LIB                           ,"BN lib"},
-{ERR_R_RSA_LIB                          ,"RSA lib"},
-{ERR_R_DH_LIB                           ,"DH lib"},
-{ERR_R_EVP_LIB                          ,"EVP lib"},
-{ERR_R_BUF_LIB                          ,"BUF lib"},
-{ERR_R_OBJ_LIB                          ,"OBJ lib"},
-{ERR_R_PEM_LIB                          ,"PEM lib"},
-{ERR_R_DSA_LIB                          ,"DSA lib"},
-{ERR_R_X509_LIB                         ,"X509 lib"},
-{ERR_R_ASN1_LIB                         ,"ASN1 lib"},
-{ERR_R_CONF_LIB                         ,"CONF lib"},
-{ERR_R_CRYPTO_LIB                       ,"CRYPTO lib"},
-{ERR_R_EC_LIB                           ,"EC lib"},
-{ERR_R_SSL_LIB                          ,"SSL lib"},
-{ERR_R_BIO_LIB                          ,"BIO lib"},
-{ERR_R_PKCS7_LIB                        ,"PKCS7 lib"},
-{ERR_R_X509V3_LIB                       ,"X509V3 lib"},
-{ERR_R_PKCS12_LIB                       ,"PKCS12 lib"},
-{ERR_R_RAND_LIB                         ,"RAND lib"},
-{ERR_R_DSO_LIB                          ,"DSO lib"},
-{ERR_R_ENGINE_LIB                       ,"ENGINE lib"},
-{ERR_R_OCSP_LIB                         ,"OCSP lib"},
-
-{ERR_R_NESTED_ASN1_ERROR                ,"nested asn1 error"},
-{ERR_R_BAD_ASN1_OBJECT_HEADER           ,"bad asn1 object header"},
-{ERR_R_BAD_GET_ASN1_OBJECT_CALL         ,"bad get asn1 object call"},
-{ERR_R_EXPECTING_AN_ASN1_SEQUENCE       ,"expecting an asn1 sequence"},
-{ERR_R_ASN1_LENGTH_MISMATCH             ,"asn1 length mismatch"},
-{ERR_R_MISSING_ASN1_EOS                 ,"missing asn1 eos"},
-
-{ERR_R_FATAL                            ,"fatal"},
-{ERR_R_MALLOC_FAILURE                   ,"malloc failure"},
-{ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED      ,"called a function you should not call"},
-{ERR_R_PASSED_NULL_PARAMETER            ,"passed a null parameter"},
-{ERR_R_INTERNAL_ERROR                   ,"internal error"},
-{ERR_R_DISABLED                         ,"called a function that was disabled at compile-time"},
-
-{0,NULL},
-        };
-#endif
-
-#ifndef OPENSSL_NO_ERR
-#define NUM_SYS_STR_REASONS 127
-#define LEN_SYS_STR_REASON 32
-
-static ERR_STRING_DATA SYS_str_reasons[NUM_SYS_STR_REASONS + 1];
-/* SYS_str_reasons is filled with copies of strerror() results at
- * initialization.
- * 'errno' values up to 127 should cover all usual errors,
- * others will be displayed numerically by ERR_error_string.
- * It is crucial that we have something for each reason code
- * that occurs in ERR_str_reasons, or bogus reason strings
- * will be returned for SYSerr, which always gets an errno
- * value and never one of those 'standard' reason codes. */
-
-static void build_SYS_str_reasons(void)
-        {
-        /* OPENSSL_malloc cannot be used here, use static storage instead */
-        static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
-        int i;
-        static int init = 1;
-
-        CRYPTO_r_lock(CRYPTO_LOCK_ERR);
-        if (!init)
-                {
-                CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-                return;
-                }
-        
-        CRYPTO_r_unlock(CRYPTO_LOCK_ERR);
-        CRYPTO_w_lock(CRYPTO_LOCK_ERR);
-        if (!init)
-                {
-                CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-                return;
-                }
-
-        for (i = 1; i <= NUM_SYS_STR_REASONS; i++)
-                {
-                ERR_STRING_DATA *str = &SYS_str_reasons[i - 1];
-
-                str->error = (unsigned long)i;
-                if (str->string == NULL)
-                        {
-                        char (*dest)[LEN_SYS_STR_REASON] = &(strerror_tab[i - 1]);
-                        char *src = strerror(i);
-                        if (src != NULL)
-                                {
-                                strncpy(*dest, src, sizeof *dest);
-                                (*dest)[sizeof *dest - 1] = '\0';
-                                str->string = *dest;
-                                }
-                        }
-                if (str->string == NULL)
-                        str->string = "unknown";
-                }
-
-        /* Now we still have SYS_str_reasons[NUM_SYS_STR_REASONS] = {0, NULL},
-         * as required by ERR_load_strings. */
-
-        init = 0;
-        
-        CRYPTO_w_unlock(CRYPTO_LOCK_ERR);
-        }
-#endif
-
-void ERR_load_ERR_strings(void)
-        {
-#ifndef OPENSSL_NO_ERR
-        if (ERR_func_error_string(ERR_str_functs[0].error) == NULL)
-                {
-                ERR_load_strings(0,ERR_str_libraries);
-                ERR_load_strings(0,ERR_str_reasons);
-                ERR_load_strings(ERR_LIB_SYS,ERR_str_functs);
-                build_SYS_str_reasons();
-                ERR_load_strings(ERR_LIB_SYS,SYS_str_reasons);
-                }
-#endif
-        }
-
diff --git a/src/lib/libcrypto/evp/e_seed.c b/src/lib/libcrypto/evp/e_seed.c
new file mode 100644
index 0000000000..2d1759d276
--- /dev/null
+++ b/src/lib/libcrypto/evp/e_seed.c
@@ -0,0 +1,83 @@
+/* crypto/evp/e_seed.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_SEED
+#include <openssl/evp.h>
+#include <openssl/err.h>
+#include <string.h>
+#include <assert.h>
+#include <openssl/seed.h>
+#include "evp_locl.h"
+
+static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc);
+
+typedef struct
+        {
+        SEED_KEY_SCHEDULE ks;
+        } EVP_SEED_KEY;
+
+IMPLEMENT_BLOCK_CIPHER(seed, ks, SEED, EVP_SEED_KEY, NID_seed,
+                       16, 16, 16, 128,
+                       0, seed_init_key, 0, 0, 0, 0)
+
+static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                         const unsigned char *iv, int enc)
+        {
+        SEED_set_key(key, ctx->cipher_data);
+        return 1;
+        }
+
+#endif
diff --git a/src/lib/libcrypto/evp/enc_min.c b/src/lib/libcrypto/evp/enc_min.c
deleted file mode 100644
index 7fba38ee24..0000000000
--- a/src/lib/libcrypto/evp/enc_min.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/* crypto/evp/enc_min.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include "evp_locl.h"
-
-void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
-        {
-#ifdef OPENSSL_FIPS
-        FIPS_selftest_check();
-#endif
-        memset(ctx,0,sizeof(EVP_CIPHER_CTX));
-        /* ctx->cipher=NULL; */
-        }
-
-#ifdef OPENSSL_FIPS
-
-/* The purpose of these is to trap programs that attempt to use non FIPS
- * algorithms in FIPS mode and ignore the errors.
- */
-
-static int bad_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                    const unsigned char *iv, int enc)
-        { FIPS_ERROR_IGNORED("Cipher init"); return 0;}
-
-static int bad_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                         const unsigned char *in, unsigned int inl)
-        { FIPS_ERROR_IGNORED("Cipher update"); return 0;}
-
-/* NB: no cleanup because it is allowed after failed init */
-
-static int bad_set_asn1(EVP_CIPHER_CTX *ctx, ASN1_TYPE *typ)
-        { FIPS_ERROR_IGNORED("Cipher set_asn1"); return 0;}
-static int bad_get_asn1(EVP_CIPHER_CTX *ctx, ASN1_TYPE *typ)
-        { FIPS_ERROR_IGNORED("Cipher get_asn1"); return 0;}
-static int bad_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
-        { FIPS_ERROR_IGNORED("Cipher ctrl"); return 0;}
-
-static const EVP_CIPHER bad_cipher =
-        {
-        0,
-        0,
-        0,
-        0,
-        0,
-        bad_init,
-        bad_do_cipher,
-        NULL,
-        0,
-        bad_set_asn1,
-        bad_get_asn1,
-        bad_ctrl,
-        NULL
-        };
-
-#endif
-
-#ifndef OPENSSL_NO_ENGINE
-
-#ifdef OPENSSL_FIPS
-
-static int do_engine_null(ENGINE *impl) { return 0;}
-static int do_evp_enc_engine_null(EVP_CIPHER_CTX *ctx,
-                                const EVP_CIPHER **pciph, ENGINE *impl)
-        { return 1; }
-
-static int (*do_engine_finish)(ENGINE *impl)
-                = do_engine_null;
-
-static int (*do_evp_enc_engine)
-        (EVP_CIPHER_CTX *ctx, const EVP_CIPHER **pciph, ENGINE *impl)
-                = do_evp_enc_engine_null;
-
-void int_EVP_CIPHER_set_engine_callbacks(
-        int (*eng_ciph_fin)(ENGINE *impl),
-        int (*eng_ciph_evp)
-                (EVP_CIPHER_CTX *ctx, const EVP_CIPHER **pciph, ENGINE *impl))
-        {
-        do_engine_finish = eng_ciph_fin;
-        do_evp_enc_engine = eng_ciph_evp;
-        }
-
-#else
-
-#define do_engine_finish ENGINE_finish
-
-static int do_evp_enc_engine(EVP_CIPHER_CTX *ctx, const EVP_CIPHER **pcipher, ENGINE *impl)
-        {
-        if(impl)
-                {
-                if (!ENGINE_init(impl))
-                        {
-                        EVPerr(EVP_F_DO_EVP_ENC_ENGINE, EVP_R_INITIALIZATION_ERROR);
-                        return 0;
-                        }
-                }
-        else
-                /* Ask if an ENGINE is reserved for this job */
-                impl = ENGINE_get_cipher_engine((*pcipher)->nid);
-        if(impl)
-                {
-                /* There's an ENGINE for this job ... (apparently) */
-                const EVP_CIPHER *c = ENGINE_get_cipher(impl, (*pcipher)->nid);
-                if(!c)
-                        {
-                        /* One positive side-effect of US's export
-                         * control history, is that we should at least
-                         * be able to avoid using US mispellings of
-                         * "initialisation"? */
-                        EVPerr(EVP_F_DO_EVP_ENC_ENGINE, EVP_R_INITIALIZATION_ERROR);
-                        return 0;
-                        }
-                /* We'll use the ENGINE's private cipher definition */
-                *pcipher = c;
-                /* Store the ENGINE functional reference so we know
-                 * 'cipher' came from an ENGINE and we need to release
-                 * it when done. */
-                ctx->engine = impl;
-                }
-        else
-                ctx->engine = NULL;
-        return 1;
-        }
-
-#endif
-
-#endif
-
-int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
-             const unsigned char *key, const unsigned char *iv, int enc)
-        {
-        if (enc == -1)
-                enc = ctx->encrypt;
-        else
-                {
-                if (enc)
-                        enc = 1;
-                ctx->encrypt = enc;
-                }
-#ifdef OPENSSL_FIPS
-        if(FIPS_selftest_failed())
-                {
-                FIPSerr(FIPS_F_EVP_CIPHERINIT_EX,FIPS_R_FIPS_SELFTEST_FAILED);
-                ctx->cipher = &bad_cipher;
-                return 0;
-                }
-#endif
-#ifndef OPENSSL_NO_ENGINE
-        /* Whether it's nice or not, "Inits" can be used on "Final"'d contexts
-         * so this context may already have an ENGINE! Try to avoid releasing
-         * the previous handle, re-querying for an ENGINE, and having a
-         * reinitialisation, when it may all be unecessary. */
-        if (ctx->engine && ctx->cipher && (!cipher ||
-                        (cipher && (cipher->nid == ctx->cipher->nid))))
-                goto skip_to_init;
-#endif
-        if (cipher)
-                {
-                /* Ensure a context left lying around from last time is cleared
-                 * (the previous check attempted to avoid this if the same
-                 * ENGINE and EVP_CIPHER could be used). */
-                EVP_CIPHER_CTX_cleanup(ctx);
-
-                /* Restore encrypt field: it is zeroed by cleanup */
-                ctx->encrypt = enc;
-#ifndef OPENSSL_NO_ENGINE
-                if (!do_evp_enc_engine(ctx, &cipher, impl))
-                        return 0;
-#endif
-
-                ctx->cipher=cipher;
-                if (ctx->cipher->ctx_size)
-                        {
-                        ctx->cipher_data=OPENSSL_malloc(ctx->cipher->ctx_size);
-                        if (!ctx->cipher_data)
-                                {
-                                EVPerr(EVP_F_EVP_CIPHERINIT_EX, ERR_R_MALLOC_FAILURE);
-                                return 0;
-                                }
-                        }
-                else
-                        {
-                        ctx->cipher_data = NULL;
-                        }
-                ctx->key_len = cipher->key_len;
-                ctx->flags = 0;
-                if(ctx->cipher->flags & EVP_CIPH_CTRL_INIT)
-                        {
-                        if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_INIT, 0, NULL))
-                                {
-                                EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_INITIALIZATION_ERROR);
-                                return 0;
-                                }
-                        }
-                }
-        else if(!ctx->cipher)
-                {
-                EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_NO_CIPHER_SET);
-                return 0;
-                }
-#ifndef OPENSSL_NO_ENGINE
-skip_to_init:
-#endif
-        /* we assume block size is a power of 2 in *cryptUpdate */
-        OPENSSL_assert(ctx->cipher->block_size == 1
-            || ctx->cipher->block_size == 8
-            || ctx->cipher->block_size == 16);
-
-        if(!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_CUSTOM_IV)) {
-                switch(EVP_CIPHER_CTX_mode(ctx)) {
-
-                        case EVP_CIPH_STREAM_CIPHER:
-                        case EVP_CIPH_ECB_MODE:
-                        break;
-
-                        case EVP_CIPH_CFB_MODE:
-                        case EVP_CIPH_OFB_MODE:
-
-                        ctx->num = 0;
-
-                        case EVP_CIPH_CBC_MODE:
-
-                        OPENSSL_assert(EVP_CIPHER_CTX_iv_length(ctx) <=
-                                        (int)sizeof(ctx->iv));
-                        if(iv) memcpy(ctx->oiv, iv, EVP_CIPHER_CTX_iv_length(ctx));
-                        memcpy(ctx->iv, ctx->oiv, EVP_CIPHER_CTX_iv_length(ctx));
-                        break;
-
-                        default:
-                        return 0;
-                        break;
-                }
-        }
-
-#ifdef OPENSSL_FIPS
-        /* After 'key' is set no further parameters changes are permissible.
-         * So only check for non FIPS enabling at this point.
-         */
-        if (key && FIPS_mode())
-                {
-                if (!(ctx->cipher->flags & EVP_CIPH_FLAG_FIPS)
-                        & !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW))
-                        {
-                        EVPerr(EVP_F_EVP_CIPHERINIT_EX, EVP_R_DISABLED_FOR_FIPS);
-#if 0
-                        ERR_add_error_data(2, "cipher=",
-                                                EVP_CIPHER_name(ctx->cipher));
-#endif
-                        ctx->cipher = &bad_cipher;
-                        return 0;
-                        }
-                }
-#endif
-
-        if(key || (ctx->cipher->flags & EVP_CIPH_ALWAYS_CALL_INIT)) {
-                if(!ctx->cipher->init(ctx,key,iv,enc)) return 0;
-        }
-        ctx->buf_len=0;
-        ctx->final_used=0;
-        ctx->block_mask=ctx->cipher->block_size-1;
-        return 1;
-        }
-
-int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
-        {
-        if (c->cipher != NULL)
-                {
-                if(c->cipher->cleanup && !c->cipher->cleanup(c))
-                        return 0;
-                /* Cleanse cipher context data */
-                if (c->cipher_data)
-                        OPENSSL_cleanse(c->cipher_data, c->cipher->ctx_size);
-                }
-        if (c->cipher_data)
-                OPENSSL_free(c->cipher_data);
-#ifndef OPENSSL_NO_ENGINE
-        if (c->engine)
-                /* The EVP_CIPHER we used belongs to an ENGINE, release the
-                 * functional reference we held for this reason. */
-                do_engine_finish(c->engine);
-#endif
-        memset(c,0,sizeof(EVP_CIPHER_CTX));
-        return 1;
-        }
-
-int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl)
-        {
-#ifdef OPENSSL_FIPS
-        FIPS_selftest_check();
-#endif
-        return ctx->cipher->do_cipher(ctx,out,in,inl);
-        }
-
-int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
-{
-        int ret;
-        if(!ctx->cipher) {
-                EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL, EVP_R_NO_CIPHER_SET);
-                return 0;
-        }
-
-        if(!ctx->cipher->ctrl) {
-                EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL, EVP_R_CTRL_NOT_IMPLEMENTED);
-                return 0;
-        }
-
-        ret = ctx->cipher->ctrl(ctx, type, arg, ptr);
-        if(ret == -1) {
-                EVPerr(EVP_F_EVP_CIPHER_CTX_CTRL, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED);
-                return 0;
-        }
-        return ret;
-}
-
-unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx)
-        {
-        return ctx->cipher->flags;
-        }
-
-int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
-        {
-        return ctx->cipher->iv_len;
-        }
-
-int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
-        {
-        return cipher->nid;
-        }
diff --git a/src/lib/libcrypto/fips_err.c b/src/lib/libcrypto/fips_err.c
deleted file mode 100644
index 09f11748f6..0000000000
--- a/src/lib/libcrypto/fips_err.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-# include "fips_err.h"
-#else
-static void *dummy=&dummy;
-#endif
diff --git a/src/lib/libcrypto/jpake/Makefile b/src/lib/libcrypto/jpake/Makefile
new file mode 100644
index 0000000000..110c49ce0b
--- /dev/null
+++ b/src/lib/libcrypto/jpake/Makefile
@@ -0,0 +1,64 @@
+DIR=jpake
+TOP=../..
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+LIB=$(TOP)/libcrypto.a
+LIBOBJ=jpake.o jpake_err.o
+LIBSRC=jpake.c jpake_err.c
+
+EXHEADER=jpake.h
+TEST=jpaketest.c
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.s *.o *.obj des lib tags core .pure .nfs* *.old *.bak fluff
+
+jpaketest: top jpaketest.c $(LIB)
+        $(CC) $(CFLAGS) -Wall -Werror -g -o jpaketest jpaketest.c $(LIB)
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+jpake.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+jpake.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+jpake.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+jpake.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+jpake.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+jpake.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+jpake.o: ../../include/openssl/symhacks.h jpake.c jpake.h
+jpake_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+jpake_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+jpake_err.o: ../../include/openssl/err.h ../../include/openssl/jpake.h
+jpake_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+jpake_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+jpake_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+jpake_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+jpake_err.o: jpake_err.c
diff --git a/src/lib/libcrypto/jpake/jpake.c b/src/lib/libcrypto/jpake/jpake.c
new file mode 100644
index 0000000000..086d9f47e0
--- /dev/null
+++ b/src/lib/libcrypto/jpake/jpake.c
@@ -0,0 +1,482 @@
+#include "jpake.h"
+
+#include <openssl/crypto.h>
+#include <openssl/sha.h>
+#include <openssl/err.h>
+#include <memory.h>
+
+/*
+ * In the definition, (xa, xb, xc, xd) are Alice's (x1, x2, x3, x4) or
+ * Bob's (x3, x4, x1, x2). If you see what I mean.
+ */
+
+typedef struct
+    {
+    char *name;  /* Must be unique */
+    char *peer_name;
+    BIGNUM *p;
+    BIGNUM *g;
+    BIGNUM *q;
+    BIGNUM *gxc; /* Alice's g^{x3} or Bob's g^{x1} */
+    BIGNUM *gxd; /* Alice's g^{x4} or Bob's g^{x2} */
+    } JPAKE_CTX_PUBLIC;
+
+struct JPAKE_CTX
+    {
+    JPAKE_CTX_PUBLIC p;
+    BIGNUM *secret;   /* The shared secret */
+    BN_CTX *ctx;
+    BIGNUM *xa;       /* Alice's x1 or Bob's x3 */
+    BIGNUM *xb;       /* Alice's x2 or Bob's x4 */
+    BIGNUM *key;      /* The calculated (shared) key */
+    };
+
+static void JPAKE_ZKP_init(JPAKE_ZKP *zkp)
+    {
+    zkp->gr = BN_new();
+    zkp->b = BN_new();
+    }
+
+static void JPAKE_ZKP_release(JPAKE_ZKP *zkp)
+    {
+    BN_free(zkp->b);
+    BN_free(zkp->gr);
+    }
+
+/* Two birds with one stone - make the global name as expected */
+#define JPAKE_STEP_PART_init    JPAKE_STEP2_init
+#define JPAKE_STEP_PART_release JPAKE_STEP2_release
+
+void JPAKE_STEP_PART_init(JPAKE_STEP_PART *p)
+    {
+    p->gx = BN_new();
+    JPAKE_ZKP_init(&p->zkpx);
+    }
+
+void JPAKE_STEP_PART_release(JPAKE_STEP_PART *p)
+    {
+    JPAKE_ZKP_release(&p->zkpx);
+    BN_free(p->gx);
+    }
+
+void JPAKE_STEP1_init(JPAKE_STEP1 *s1)
+    {
+    JPAKE_STEP_PART_init(&s1->p1);
+    JPAKE_STEP_PART_init(&s1->p2);
+    }
+
+void JPAKE_STEP1_release(JPAKE_STEP1 *s1)
+    {
+    JPAKE_STEP_PART_release(&s1->p2);
+    JPAKE_STEP_PART_release(&s1->p1);
+    }
+
+static void JPAKE_CTX_init(JPAKE_CTX *ctx, const char *name,
+                           const char *peer_name, const BIGNUM *p,
+                           const BIGNUM *g, const BIGNUM *q,
+                           const BIGNUM *secret)
+    {
+    ctx->p.name = OPENSSL_strdup(name);
+    ctx->p.peer_name = OPENSSL_strdup(peer_name);
+    ctx->p.p = BN_dup(p);
+    ctx->p.g = BN_dup(g);
+    ctx->p.q = BN_dup(q);
+    ctx->secret = BN_dup(secret);
+
+    ctx->p.gxc = BN_new();
+    ctx->p.gxd = BN_new();
+
+    ctx->xa = BN_new();
+    ctx->xb = BN_new();
+    ctx->key = BN_new();
+    ctx->ctx = BN_CTX_new();
+    }
+    
+static void JPAKE_CTX_release(JPAKE_CTX *ctx)
+    {
+    BN_CTX_free(ctx->ctx);
+    BN_clear_free(ctx->key);
+    BN_clear_free(ctx->xb);
+    BN_clear_free(ctx->xa);
+
+    BN_free(ctx->p.gxd);
+    BN_free(ctx->p.gxc);
+
+    BN_clear_free(ctx->secret);
+    BN_free(ctx->p.q);
+    BN_free(ctx->p.g);
+    BN_free(ctx->p.p);
+    OPENSSL_free(ctx->p.peer_name);
+    OPENSSL_free(ctx->p.name);
+
+    memset(ctx, '\0', sizeof *ctx);
+    }
+    
+JPAKE_CTX *JPAKE_CTX_new(const char *name, const char *peer_name,
+                         const BIGNUM *p, const BIGNUM *g, const BIGNUM *q,
+                         const BIGNUM *secret)
+    {
+    JPAKE_CTX *ctx = OPENSSL_malloc(sizeof *ctx);
+
+    JPAKE_CTX_init(ctx, name, peer_name, p, g, q, secret);
+
+    return ctx;
+    }
+
+void JPAKE_CTX_free(JPAKE_CTX *ctx)
+    {
+    JPAKE_CTX_release(ctx);
+    OPENSSL_free(ctx);
+    }
+
+static void hashlength(SHA_CTX *sha, size_t l)
+    {
+    unsigned char b[2];
+
+    OPENSSL_assert(l <= 0xffff);
+    b[0] = l >> 8;
+    b[1] = l&0xff;
+    SHA1_Update(sha, b, 2);
+    }
+
+static void hashstring(SHA_CTX *sha, const char *string)
+    {
+    size_t l = strlen(string);
+
+    hashlength(sha, l);
+    SHA1_Update(sha, string, l);
+    }
+
+static void hashbn(SHA_CTX *sha, const BIGNUM *bn)
+    {
+    size_t l = BN_num_bytes(bn);
+    unsigned char *bin = OPENSSL_malloc(l);
+
+    hashlength(sha, l);
+    BN_bn2bin(bn, bin);
+    SHA1_Update(sha, bin, l);
+    OPENSSL_free(bin);
+    }
+
+/* h=hash(g, g^r, g^x, name) */
+static void zkp_hash(BIGNUM *h, const BIGNUM *zkpg, const JPAKE_STEP_PART *p,
+                     const char *proof_name)
+    {
+    unsigned char md[SHA_DIGEST_LENGTH];
+    SHA_CTX sha;
+
+   /*
+    * XXX: hash should not allow moving of the boundaries - Java code
+    * is flawed in this respect. Length encoding seems simplest.
+    */
+    SHA1_Init(&sha);
+    hashbn(&sha, zkpg);
+    OPENSSL_assert(!BN_is_zero(p->zkpx.gr));
+    hashbn(&sha, p->zkpx.gr);
+    hashbn(&sha, p->gx);
+    hashstring(&sha, proof_name);
+    SHA1_Final(md, &sha);
+    BN_bin2bn(md, SHA_DIGEST_LENGTH, h);
+    }
+
+/*
+ * Prove knowledge of x
+ * Note that p->gx has already been calculated
+ */
+static void generate_zkp(JPAKE_STEP_PART *p, const BIGNUM *x,
+                         const BIGNUM *zkpg, JPAKE_CTX *ctx)
+    {
+    BIGNUM *r = BN_new();
+    BIGNUM *h = BN_new();
+    BIGNUM *t = BN_new();
+
+   /*
+    * r in [0,q)
+    * XXX: Java chooses r in [0, 2^160) - i.e. distribution not uniform
+    */
+    BN_rand_range(r, ctx->p.q);
+   /* g^r */
+    BN_mod_exp(p->zkpx.gr, zkpg, r, ctx->p.p, ctx->ctx);
+
+   /* h=hash... */
+    zkp_hash(h, zkpg, p, ctx->p.name);
+
+   /* b = r - x*h */
+    BN_mod_mul(t, x, h, ctx->p.q, ctx->ctx);
+    BN_mod_sub(p->zkpx.b, r, t, ctx->p.q, ctx->ctx);
+
+   /* cleanup */
+    BN_free(t);
+    BN_free(h);
+    BN_free(r);
+    }
+
+static int verify_zkp(const JPAKE_STEP_PART *p, const BIGNUM *zkpg,
+                      JPAKE_CTX *ctx)
+    {
+    BIGNUM *h = BN_new();
+    BIGNUM *t1 = BN_new();
+    BIGNUM *t2 = BN_new();
+    BIGNUM *t3 = BN_new();
+    int ret = 0;
+
+    zkp_hash(h, zkpg, p, ctx->p.peer_name);
+
+   /* t1 = g^b */
+    BN_mod_exp(t1, zkpg, p->zkpx.b, ctx->p.p, ctx->ctx);
+   /* t2 = (g^x)^h = g^{hx} */
+    BN_mod_exp(t2, p->gx, h, ctx->p.p, ctx->ctx);
+   /* t3 = t1 * t2 = g^{hx} * g^b = g^{hx+b} = g^r (allegedly) */
+    BN_mod_mul(t3, t1, t2, ctx->p.p, ctx->ctx);
+
+   /* verify t3 == g^r */
+    if(BN_cmp(t3, p->zkpx.gr) == 0)
+        ret = 1;
+    else
+        JPAKEerr(JPAKE_F_VERIFY_ZKP, JPAKE_R_ZKP_VERIFY_FAILED);
+
+   /* cleanup */
+    BN_free(t3);
+    BN_free(t2);
+    BN_free(t1);
+    BN_free(h);
+
+    return ret;
+    }    
+
+static void generate_step_part(JPAKE_STEP_PART *p, const BIGNUM *x,
+                               const BIGNUM *g, JPAKE_CTX *ctx)
+    {
+    BN_mod_exp(p->gx, g, x, ctx->p.p, ctx->ctx);
+    generate_zkp(p, x, g, ctx);
+    }
+
+/* Generate each party's random numbers. xa is in [0, q), xb is in [1, q). */
+static void genrand(JPAKE_CTX *ctx)
+    {
+    BIGNUM *qm1;
+
+   /* xa in [0, q) */
+    BN_rand_range(ctx->xa, ctx->p.q);
+
+   /* q-1 */
+    qm1 = BN_new();
+    BN_copy(qm1, ctx->p.q);
+    BN_sub_word(qm1, 1);
+
+   /* ... and xb in [0, q-1) */
+    BN_rand_range(ctx->xb, qm1);
+   /* [1, q) */
+    BN_add_word(ctx->xb, 1);
+
+   /* cleanup */
+    BN_free(qm1);
+    }
+
+int JPAKE_STEP1_generate(JPAKE_STEP1 *send, JPAKE_CTX *ctx)
+    {
+    genrand(ctx);
+    generate_step_part(&send->p1, ctx->xa, ctx->p.g, ctx);
+    generate_step_part(&send->p2, ctx->xb, ctx->p.g, ctx);
+
+    return 1;
+    }
+
+int JPAKE_STEP1_process(JPAKE_CTX *ctx, const JPAKE_STEP1 *received)
+    {
+   /* verify their ZKP(xc) */
+    if(!verify_zkp(&received->p1, ctx->p.g, ctx))
+        {
+        JPAKEerr(JPAKE_F_JPAKE_STEP1_PROCESS, JPAKE_R_VERIFY_X3_FAILED);
+        return 0;
+        }
+
+   /* verify their ZKP(xd) */
+    if(!verify_zkp(&received->p2, ctx->p.g, ctx))
+        {
+        JPAKEerr(JPAKE_F_JPAKE_STEP1_PROCESS, JPAKE_R_VERIFY_X4_FAILED);
+        return 0;
+        }
+
+   /* g^xd != 1 */
+    if(BN_is_one(received->p2.gx))
+        {
+        JPAKEerr(JPAKE_F_JPAKE_STEP1_PROCESS, JPAKE_R_G_TO_THE_X4_IS_ONE);
+        return 0;
+        }
+
+   /* Save the bits we need for later */
+    BN_copy(ctx->p.gxc, received->p1.gx);
+    BN_copy(ctx->p.gxd, received->p2.gx);
+
+    return 1;
+    }
+
+
+int JPAKE_STEP2_generate(JPAKE_STEP2 *send, JPAKE_CTX *ctx)
+    {
+    BIGNUM *t1 = BN_new();
+    BIGNUM *t2 = BN_new();
+
+   /*
+    * X = g^{(xa + xc + xd) * xb * s}
+    * t1 = g^xa
+    */
+    BN_mod_exp(t1, ctx->p.g, ctx->xa, ctx->p.p, ctx->ctx);
+   /* t2 = t1 * g^{xc} = g^{xa} * g^{xc} = g^{xa + xc} */
+    BN_mod_mul(t2, t1, ctx->p.gxc, ctx->p.p, ctx->ctx);
+   /* t1 = t2 * g^{xd} = g^{xa + xc + xd} */
+    BN_mod_mul(t1, t2, ctx->p.gxd, ctx->p.p, ctx->ctx);
+   /* t2 = xb * s */
+    BN_mod_mul(t2, ctx->xb, ctx->secret, ctx->p.q, ctx->ctx);
+
+   /*
+    * ZKP(xb * s)
+    * XXX: this is kinda funky, because we're using
+    *
+    * g' = g^{xa + xc + xd}
+    *
+    * as the generator, which means X is g'^{xb * s}
+    * X = t1^{t2} = t1^{xb * s} = g^{(xa + xc + xd) * xb * s}
+    */
+    generate_step_part(send, t2, t1, ctx);
+
+   /* cleanup */
+    BN_free(t1);
+    BN_free(t2);
+
+    return 1;
+    }
+
+/* gx = g^{xc + xa + xb} * xd * s */
+static int compute_key(JPAKE_CTX *ctx, const BIGNUM *gx)
+    {
+    BIGNUM *t1 = BN_new();
+    BIGNUM *t2 = BN_new();
+    BIGNUM *t3 = BN_new();
+
+   /*
+    * K = (gx/g^{xb * xd * s})^{xb}
+    *   = (g^{(xc + xa + xb) * xd * s - xb * xd *s})^{xb}
+    *   = (g^{(xa + xc) * xd * s})^{xb}
+    *   = g^{(xa + xc) * xb * xd * s}
+    * [which is the same regardless of who calculates it]
+    */
+
+   /* t1 = (g^{xd})^{xb} = g^{xb * xd} */
+    BN_mod_exp(t1, ctx->p.gxd, ctx->xb, ctx->p.p, ctx->ctx);
+   /* t2 = -s = q-s */
+    BN_sub(t2, ctx->p.q, ctx->secret);
+   /* t3 = t1^t2 = g^{-xb * xd * s} */
+    BN_mod_exp(t3, t1, t2, ctx->p.p, ctx->ctx);
+   /* t1 = gx * t3 = X/g^{xb * xd * s} */
+    BN_mod_mul(t1, gx, t3, ctx->p.p, ctx->ctx);
+   /* K = t1^{xb} */
+    BN_mod_exp(ctx->key, t1, ctx->xb, ctx->p.p, ctx->ctx);
+
+   /* cleanup */
+    BN_free(t3);
+    BN_free(t2);
+    BN_free(t1);
+
+    return 1;
+    }
+
+int JPAKE_STEP2_process(JPAKE_CTX *ctx, const JPAKE_STEP2 *received)
+    {
+    BIGNUM *t1 = BN_new();
+    BIGNUM *t2 = BN_new();
+    int ret = 0;
+
+   /*
+    * g' = g^{xc + xa + xb} [from our POV]
+    * t1 = xa + xb
+    */
+    BN_mod_add(t1, ctx->xa, ctx->xb, ctx->p.q, ctx->ctx);
+   /* t2 = g^{t1} = g^{xa+xb} */
+    BN_mod_exp(t2, ctx->p.g, t1, ctx->p.p, ctx->ctx);
+   /* t1 = g^{xc} * t2 = g^{xc + xa + xb} */
+    BN_mod_mul(t1, ctx->p.gxc, t2, ctx->p.p, ctx->ctx);
+
+    if(verify_zkp(received, t1, ctx))
+        ret = 1;
+    else
+        JPAKEerr(JPAKE_F_JPAKE_STEP2_PROCESS, JPAKE_R_VERIFY_B_FAILED);
+
+    compute_key(ctx, received->gx);
+
+   /* cleanup */
+    BN_free(t2);
+    BN_free(t1);
+
+    return ret;
+    }
+
+static void quickhashbn(unsigned char *md, const BIGNUM *bn)
+    {
+    SHA_CTX sha;
+
+    SHA1_Init(&sha);
+    hashbn(&sha, bn);
+    SHA1_Final(md, &sha);
+    }
+
+void JPAKE_STEP3A_init(JPAKE_STEP3A *s3a)
+    {}
+
+int JPAKE_STEP3A_generate(JPAKE_STEP3A *send, JPAKE_CTX *ctx)
+    {
+    quickhashbn(send->hhk, ctx->key);
+    SHA1(send->hhk, sizeof send->hhk, send->hhk);
+
+    return 1;
+    }
+
+int JPAKE_STEP3A_process(JPAKE_CTX *ctx, const JPAKE_STEP3A *received)
+    {
+    unsigned char hhk[SHA_DIGEST_LENGTH];
+
+    quickhashbn(hhk, ctx->key);
+    SHA1(hhk, sizeof hhk, hhk);
+    if(memcmp(hhk, received->hhk, sizeof hhk))
+        {
+        JPAKEerr(JPAKE_F_JPAKE_STEP3A_PROCESS, JPAKE_R_HASH_OF_HASH_OF_KEY_MISMATCH);
+        return 0;
+        }
+    return 1;
+    }
+
+void JPAKE_STEP3A_release(JPAKE_STEP3A *s3a)
+    {}
+
+void JPAKE_STEP3B_init(JPAKE_STEP3B *s3b)
+    {}
+
+int JPAKE_STEP3B_generate(JPAKE_STEP3B *send, JPAKE_CTX *ctx)
+    {
+    quickhashbn(send->hk, ctx->key);
+
+    return 1;
+    }
+
+int JPAKE_STEP3B_process(JPAKE_CTX *ctx, const JPAKE_STEP3B *received)
+    {
+    unsigned char hk[SHA_DIGEST_LENGTH];
+
+    quickhashbn(hk, ctx->key);
+    if(memcmp(hk, received->hk, sizeof hk))
+        {
+        JPAKEerr(JPAKE_F_JPAKE_STEP3B_PROCESS, JPAKE_R_HASH_OF_KEY_MISMATCH);
+        return 0;
+        }
+    return 1;
+    }
+
+void JPAKE_STEP3B_release(JPAKE_STEP3B *s3b)
+    {}
+
+const BIGNUM *JPAKE_get_shared_key(JPAKE_CTX *ctx)
+    {
+    return ctx->key;
+    }
+
diff --git a/src/lib/libcrypto/jpake/jpake.h b/src/lib/libcrypto/jpake/jpake.h
new file mode 100644
index 0000000000..693ea188cb
--- /dev/null
+++ b/src/lib/libcrypto/jpake/jpake.h
@@ -0,0 +1,129 @@
+/*
+ * Implement J-PAKE, as described in
+ * http://grouper.ieee.org/groups/1363/Research/contributions/hao-ryan-2008.pdf
+ * 
+ * With hints from http://www.cl.cam.ac.uk/~fh240/software/JPAKE2.java.
+ */
+
+#ifndef HEADER_JPAKE_H
+#define HEADER_JPAKE_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_JPAKE
+#error JPAKE is disabled.
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#include <openssl/bn.h>
+#include <openssl/sha.h>
+
+typedef struct JPAKE_CTX JPAKE_CTX;
+
+/* Note that "g" in the ZKPs is not necessarily the J-PAKE g. */
+typedef struct
+    {
+    BIGNUM *gr; /* g^r (r random) */
+    BIGNUM *b;  /* b = r - x*h, h=hash(g, g^r, g^x, name) */
+    } JPAKE_ZKP;
+
+typedef struct
+    {
+    BIGNUM *gx;       /* g^x in step 1, g^(xa + xc + xd) * xb * s in step 2 */
+    JPAKE_ZKP zkpx;   /* ZKP(x) or ZKP(xb * s) */
+    } JPAKE_STEP_PART;
+
+typedef struct
+    {
+    JPAKE_STEP_PART p1;   /* g^x3, ZKP(x3) or g^x1, ZKP(x1) */
+    JPAKE_STEP_PART p2;   /* g^x4, ZKP(x4) or g^x2, ZKP(x2) */
+    } JPAKE_STEP1;
+
+typedef JPAKE_STEP_PART JPAKE_STEP2;
+
+typedef struct
+    {
+    unsigned char hhk[SHA_DIGEST_LENGTH];
+    } JPAKE_STEP3A;
+
+typedef struct
+    {
+    unsigned char hk[SHA_DIGEST_LENGTH];
+    } JPAKE_STEP3B;
+
+/* Parameters are copied */
+JPAKE_CTX *JPAKE_CTX_new(const char *name, const char *peer_name,
+                         const BIGNUM *p, const BIGNUM *g, const BIGNUM *q,
+                         const BIGNUM *secret);
+void JPAKE_CTX_free(JPAKE_CTX *ctx);
+
+/*
+ * Note that JPAKE_STEP1 can be used multiple times before release
+ * without another init.
+ */
+void JPAKE_STEP1_init(JPAKE_STEP1 *s1);
+int JPAKE_STEP1_generate(JPAKE_STEP1 *send, JPAKE_CTX *ctx);
+int JPAKE_STEP1_process(JPAKE_CTX *ctx, const JPAKE_STEP1 *received);
+void JPAKE_STEP1_release(JPAKE_STEP1 *s1);
+
+/*
+ * Note that JPAKE_STEP2 can be used multiple times before release
+ * without another init.
+ */
+void JPAKE_STEP2_init(JPAKE_STEP2 *s2);
+int JPAKE_STEP2_generate(JPAKE_STEP2 *send, JPAKE_CTX *ctx);
+int JPAKE_STEP2_process(JPAKE_CTX *ctx, const JPAKE_STEP2 *received);
+void JPAKE_STEP2_release(JPAKE_STEP2 *s2);
+
+/*
+ * Optionally verify the shared key. If the shared secrets do not
+ * match, the two ends will disagree about the shared key, but
+ * otherwise the protocol will succeed.
+ */
+void JPAKE_STEP3A_init(JPAKE_STEP3A *s3a);
+int JPAKE_STEP3A_generate(JPAKE_STEP3A *send, JPAKE_CTX *ctx);
+int JPAKE_STEP3A_process(JPAKE_CTX *ctx, const JPAKE_STEP3A *received);
+void JPAKE_STEP3A_release(JPAKE_STEP3A *s3a);
+
+void JPAKE_STEP3B_init(JPAKE_STEP3B *s3b);
+int JPAKE_STEP3B_generate(JPAKE_STEP3B *send, JPAKE_CTX *ctx);
+int JPAKE_STEP3B_process(JPAKE_CTX *ctx, const JPAKE_STEP3B *received);
+void JPAKE_STEP3B_release(JPAKE_STEP3B *s3b);
+
+/*
+ * the return value belongs to the library and will be released when
+ * ctx is released, and will change when a new handshake is performed.
+ */
+const BIGNUM *JPAKE_get_shared_key(JPAKE_CTX *ctx);
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+void ERR_load_JPAKE_strings(void);
+
+/* Error codes for the JPAKE functions. */
+
+/* Function codes. */
+#define JPAKE_F_JPAKE_STEP1_PROCESS                      101
+#define JPAKE_F_JPAKE_STEP2_PROCESS                      102
+#define JPAKE_F_JPAKE_STEP3A_PROCESS                     103
+#define JPAKE_F_JPAKE_STEP3B_PROCESS                     104
+#define JPAKE_F_VERIFY_ZKP                               100
+
+/* Reason codes. */
+#define JPAKE_R_G_TO_THE_X4_IS_ONE                       105
+#define JPAKE_R_HASH_OF_HASH_OF_KEY_MISMATCH             106
+#define JPAKE_R_HASH_OF_KEY_MISMATCH                     107
+#define JPAKE_R_VERIFY_B_FAILED                          102
+#define JPAKE_R_VERIFY_X3_FAILED                         103
+#define JPAKE_R_VERIFY_X4_FAILED                         104
+#define JPAKE_R_ZKP_VERIFY_FAILED                        100
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libcrypto/evp/evp_cnf.c b/src/lib/libcrypto/jpake/jpake_err.c
index 2e4db30235..1b95067967 100644
--- a/src/lib/libcrypto/evp/evp_cnf.c
+++ b/src/lib/libcrypto/jpake/jpake_err.c
@@ -1,9 +1,6 @@
-/* evp_cnf.c */
-/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
- * project 2007.
- */
+/* crypto/jpake/jpake_err.c */
 /* ====================================================================
- * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,7 +22,7 @@
  * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
+ *    openssl-core@OpenSSL.org.
  *
  * 5. Products derived from this software may not be called "OpenSSL"
  *    nor may "OpenSSL" appear in their names without prior written
@@ -56,70 +53,53 @@
  *
  */
 
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
 #include <stdio.h>
-#include <ctype.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/conf.h>
-#include <openssl/dso.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
+#include <openssl/err.h>
+#include <openssl/jpake.h>
 
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
 
-/* Algorithm configuration module. */
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_JPAKE,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_JPAKE,0,reason)
 
-static int alg_module_init(CONF_IMODULE *md, const CONF *cnf)
+static ERR_STRING_DATA JPAKE_str_functs[]=
         {
-        int i;
-        const char *oid_section;
-        STACK_OF(CONF_VALUE) *sktmp;
-        CONF_VALUE *oval;
-        oid_section = CONF_imodule_get_value(md);
-        if(!(sktmp = NCONF_get_section(cnf, oid_section)))
-                {
-                EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_ERROR_LOADING_SECTION);
-                return 0;
-                }
-        for(i = 0; i < sk_CONF_VALUE_num(sktmp); i++)
-                {
-                oval = sk_CONF_VALUE_value(sktmp, i);
-                if (!strcmp(oval->name, "fips_mode"))
-                        {
-                        int m;
-                        if (!X509V3_get_value_bool(oval, &m))
-                                {
-                                EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_INVALID_FIPS_MODE);
-                                return 0;
-                                }
-                        if (m > 0)
-                                {
-#ifdef OPENSSL_FIPS
-                                if (!FIPS_mode() && !FIPS_mode_set(1))
-                                        {
-                                        EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_ERROR_SETTING_FIPS_MODE);
-                                        return 0;
-                                        }
-#else
-                                EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_FIPS_MODE_NOT_SUPPORTED);
-                                return 0;
+{ERR_FUNC(JPAKE_F_JPAKE_STEP1_PROCESS), "JPAKE_STEP1_process"},
+{ERR_FUNC(JPAKE_F_JPAKE_STEP2_PROCESS), "JPAKE_STEP2_process"},
+{ERR_FUNC(JPAKE_F_JPAKE_STEP3A_PROCESS),        "JPAKE_STEP3A_process"},
+{ERR_FUNC(JPAKE_F_JPAKE_STEP3B_PROCESS),        "JPAKE_STEP3B_process"},
+{ERR_FUNC(JPAKE_F_VERIFY_ZKP),  "VERIFY_ZKP"},
+{0,NULL}
+        };
+
+static ERR_STRING_DATA JPAKE_str_reasons[]=
+        {
+{ERR_REASON(JPAKE_R_G_TO_THE_X4_IS_ONE)  ,"g to the x4 is one"},
+{ERR_REASON(JPAKE_R_HASH_OF_HASH_OF_KEY_MISMATCH),"hash of hash of key mismatch"},
+{ERR_REASON(JPAKE_R_HASH_OF_KEY_MISMATCH),"hash of key mismatch"},
+{ERR_REASON(JPAKE_R_VERIFY_B_FAILED)     ,"verify b failed"},
+{ERR_REASON(JPAKE_R_VERIFY_X3_FAILED)    ,"verify x3 failed"},
+{ERR_REASON(JPAKE_R_VERIFY_X4_FAILED)    ,"verify x4 failed"},
+{ERR_REASON(JPAKE_R_ZKP_VERIFY_FAILED)   ,"zkp verify failed"},
+{0,NULL}
+        };
+
 #endif
-                                }
-                        }
-                else
-                        {
-                        EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_UNKNOWN_OPTION);
-                        ERR_add_error_data(4, "name=", oval->name,
-                                                ", value=", oval->value);
-                        }
-                                
-                }
-        return 1;
-        }
 
-void EVP_add_alg_module(void)
+void ERR_load_JPAKE_strings(void)
         {
-        CONF_module_add("alg_section", alg_module_init, 0);
+#ifndef OPENSSL_NO_ERR
+
+        if (ERR_func_error_string(JPAKE_str_functs[0].error) == NULL)
+                {
+                ERR_load_strings(0,JPAKE_str_functs);
+                ERR_load_strings(0,JPAKE_str_reasons);
+                }
+#endif
         }
diff --git a/src/lib/libcrypto/jpake/jpaketest.c b/src/lib/libcrypto/jpake/jpaketest.c
new file mode 100644
index 0000000000..eaba75ed8a
--- /dev/null
+++ b/src/lib/libcrypto/jpake/jpaketest.c
@@ -0,0 +1,192 @@
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_JPAKE
+
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+    printf("No J-PAKE support\n");
+    return(0);
+}
+
+#else
+
+#include <openssl/jpake.h>
+#include <openssl/err.h>
+
+static void showbn(const char *name, const BIGNUM *bn)
+    {
+    fputs(name, stdout);
+    fputs(" = ", stdout);
+    BN_print_fp(stdout, bn);
+    putc('\n', stdout);
+    }
+
+static int run_jpake(JPAKE_CTX *alice, JPAKE_CTX *bob)
+    {
+    JPAKE_STEP1 alice_s1;
+    JPAKE_STEP1 bob_s1;
+    JPAKE_STEP2 alice_s2;
+    JPAKE_STEP2 bob_s2;
+    JPAKE_STEP3A alice_s3a;
+    JPAKE_STEP3B bob_s3b;
+
+   /* Alice -> Bob: step 1 */
+    puts("A->B s1");
+    JPAKE_STEP1_init(&alice_s1);
+    JPAKE_STEP1_generate(&alice_s1, alice);
+    if(!JPAKE_STEP1_process(bob, &alice_s1))
+        {
+        printf("Bob fails to process Alice's step 1\n");
+        ERR_print_errors_fp(stdout);
+        return 1;
+        }
+    JPAKE_STEP1_release(&alice_s1);
+
+   /* Bob -> Alice: step 1 */
+    puts("B->A s1");
+    JPAKE_STEP1_init(&bob_s1);
+    JPAKE_STEP1_generate(&bob_s1, bob);
+    if(!JPAKE_STEP1_process(alice, &bob_s1))
+        {
+        printf("Alice fails to process Bob's step 1\n");
+        ERR_print_errors_fp(stdout);
+        return 2;
+        }
+    JPAKE_STEP1_release(&bob_s1);
+
+   /* Alice -> Bob: step 2 */
+    puts("A->B s2");
+    JPAKE_STEP2_init(&alice_s2);
+    JPAKE_STEP2_generate(&alice_s2, alice);
+    if(!JPAKE_STEP2_process(bob, &alice_s2))
+        {
+        printf("Bob fails to process Alice's step 2\n");
+        ERR_print_errors_fp(stdout);
+        return 3;
+        }
+    JPAKE_STEP2_release(&alice_s2);
+
+   /* Bob -> Alice: step 2 */
+    puts("B->A s2");
+    JPAKE_STEP2_init(&bob_s2);
+    JPAKE_STEP2_generate(&bob_s2, bob);
+    if(!JPAKE_STEP2_process(alice, &bob_s2))
+        {
+        printf("Alice fails to process Bob's step 2\n");
+        ERR_print_errors_fp(stdout);
+        return 4;
+        }
+    JPAKE_STEP2_release(&bob_s2);
+
+    showbn("Alice's key", JPAKE_get_shared_key(alice));
+    showbn("Bob's key  ", JPAKE_get_shared_key(bob));
+
+   /* Alice -> Bob: step 3a */
+    puts("A->B s3a");
+    JPAKE_STEP3A_init(&alice_s3a);
+    JPAKE_STEP3A_generate(&alice_s3a, alice);
+    if(!JPAKE_STEP3A_process(bob, &alice_s3a))
+        {
+        printf("Bob fails to process Alice's step 3a\n");
+        ERR_print_errors_fp(stdout);
+        return 5;
+        }
+    JPAKE_STEP3A_release(&alice_s3a);
+    
+   /* Bob -> Alice: step 3b */
+    puts("B->A s3b");
+    JPAKE_STEP3B_init(&bob_s3b);
+    JPAKE_STEP3B_generate(&bob_s3b, bob);
+    if(!JPAKE_STEP3B_process(alice, &bob_s3b))
+        {
+        printf("Alice fails to process Bob's step 3b\n");
+        ERR_print_errors_fp(stdout);
+        return 6;
+        }
+    JPAKE_STEP3B_release(&bob_s3b);
+
+    return 0;
+    }
+
+int main(int argc, char **argv)
+    {
+    JPAKE_CTX *alice;
+    JPAKE_CTX *bob;
+    BIGNUM *p = NULL;
+    BIGNUM *g = NULL;
+    BIGNUM *q = NULL;
+    BIGNUM *secret = BN_new();
+    BIO *bio_err;
+
+    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
+
+    CRYPTO_malloc_debug_init();
+    CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
+    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+    ERR_load_crypto_strings();
+
+    /*
+    BN_hex2bn(&p, "fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7");
+    BN_hex2bn(&g, "f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d0782675159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243bcca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a");
+    BN_hex2bn(&q, "9760508f15230bccb292b982a2eb840bf0581cf5");
+    */
+    /*
+    p = BN_new();
+    BN_generate_prime(p, 1024, 1, NULL, NULL, NULL, NULL);
+    */
+   /* Use a safe prime for p (that we found earlier) */
+    BN_hex2bn(&p, "F9E5B365665EA7A05A9C534502780FEE6F1AB5BD4F49947FD036DBD7E905269AF46EF28B0FC07487EE4F5D20FB3C0AF8E700F3A2FA3414970CBED44FEDFF80CE78D800F184BB82435D137AADA2C6C16523247930A63B85661D1FC817A51ACD96168E95898A1F83A79FFB529368AA7833ABD1B0C3AEDDB14D2E1A2F71D99F763F");
+    showbn("p", p);
+    g = BN_new();
+    BN_set_word(g, 2);
+    showbn("g", g);
+    q = BN_new();
+    BN_rshift1(q, p);
+    showbn("q", q);
+
+    BN_rand(secret, 32, -1, 0);
+
+   /* A normal run, expect this to work... */
+    alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
+    bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
+
+    if(run_jpake(alice, bob) != 0)
+        {
+        fprintf(stderr, "Plain JPAKE run failed\n");
+        return 1;
+        }
+
+    JPAKE_CTX_free(bob);
+    JPAKE_CTX_free(alice);
+
+   /* Now give Alice and Bob different secrets */
+    alice = JPAKE_CTX_new("Alice", "Bob", p, g, q, secret);
+    BN_add_word(secret, 1);
+    bob = JPAKE_CTX_new("Bob", "Alice", p, g, q, secret);
+
+    if(run_jpake(alice, bob) != 5)
+        {
+        fprintf(stderr, "Mismatched secret JPAKE run failed\n");
+        return 1;
+        }
+
+    JPAKE_CTX_free(bob);
+    JPAKE_CTX_free(alice);
+
+    BN_free(secret);
+    BN_free(q);
+    BN_free(g);
+    BN_free(p);
+
+    CRYPTO_cleanup_all_ex_data();
+    ERR_remove_thread_state(NULL);
+    ERR_free_strings();
+    CRYPTO_mem_leaks(bio_err);
+
+    return 0;
+    }
+
+#endif
diff --git a/src/lib/libcrypto/md5/asm/md5-sparcv9.S b/src/lib/libcrypto/md5/asm/md5-sparcv9.S
deleted file mode 100644
index db45aa4c97..0000000000
--- a/src/lib/libcrypto/md5/asm/md5-sparcv9.S
+++ /dev/null
@@ -1,1031 +0,0 @@
-.ident  "md5-sparcv9.S, Version 1.0"
-.ident  "SPARC V9 ISA artwork by Andy Polyakov <appro@fy.chalmers.se>"
-.file   "md5-sparcv9.S"
-
-/*
- * ====================================================================
- * Copyright (c) 1999 Andy Polyakov <appro@fy.chalmers.se>.
- *
- * Rights for redistribution and usage in source and binary forms are
- * granted as long as above copyright notices are retained. Warranty
- * of any kind is (of course:-) disclaimed.
- * ====================================================================
- */
-
-/*
- * This is my modest contribution to OpenSSL project (see
- * http://www.openssl.org/ for more information about it) and is an
- * assembler implementation of MD5 block hash function. I've hand-coded
- * this for the sole reason to reach UltraSPARC-specific "load in
- * little-endian byte order" instruction. This gives up to 15%
- * performance improvement for cases when input message is aligned at
- * 32 bits boundary. The module was tested under both 32 *and* 64 bit
- * kernels. For updates see http://fy.chalmers.se/~appro/hpe/.
- *
- * To compile with SC4.x/SC5.x:
- *
- *      cc -xarch=v[9|8plus] -DOPENSSL_SYSNAME_ULTRASPARC -DMD5_BLOCK_DATA_ORDER \
- *              -c md5-sparcv9.S
- *
- * and with gcc:
- *
- *      gcc -mcpu=ultrasparc -DOPENSSL_SYSNAME_ULTRASPARC -DMD5_BLOCK_DATA_ORDER \
- *              -c md5-sparcv9.S
- *
- * or if above fails (it does if you have gas):
- *
- *      gcc -E -DOPENSSL_SYSNAMEULTRASPARC -DMD5_BLOCK_DATA_ORDER md5_block.sparc.S | \
- *              as -xarch=v8plus /dev/fd/0 -o md5-sparcv9.o
- */
-
-#include <openssl/e_os2.h>
-
-#define A       %o0
-#define B       %o1
-#define C       %o2
-#define D       %o3
-#define T1      %o4
-#define T2      %o5
-
-#define R0      %l0
-#define R1      %l1
-#define R2      %l2
-#define R3      %l3
-#define R4      %l4
-#define R5      %l5
-#define R6      %l6
-#define R7      %l7
-#define R8      %i3
-#define R9      %i4
-#define R10     %i5
-#define R11     %g1
-#define R12     %g2
-#define R13     %g3
-#define RX      %g4
-
-#define Aptr    %i0+0
-#define Bptr    %i0+4
-#define Cptr    %i0+8
-#define Dptr    %i0+12
-
-#define Aval    R5      /* those not used at the end of the last round */
-#define Bval    R6
-#define Cval    R7
-#define Dval    R8
-
-#if defined(MD5_BLOCK_DATA_ORDER)
-# if defined(OPENSSL_SYSNAME_ULTRASPARC)
-#  define       LOAD                    lda
-#  define       X(i)                    [%i1+i*4]%asi
-#  define       md5_block               md5_block_asm_data_order_aligned
-#  define       ASI_PRIMARY_LITTLE      0x88
-# else
-#  error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
-# endif
-#else
-# define        LOAD                    ld
-# define        X(i)                    [%i1+i*4]
-# define        md5_block               md5_block_asm_host_order
-#endif
-
-.section        ".text",#alloc,#execinstr
-
-#if defined(__SUNPRO_C) && defined(__sparcv9)
-  /* They've said -xarch=v9 at command line */
-  .register     %g2,#scratch
-  .register     %g3,#scratch
-# define        FRAME   -192
-#elif defined(__GNUC__) && defined(__arch64__)
-  /* They've said -m64 at command line */
-  .register     %g2,#scratch
-  .register     %g3,#scratch
-# define        FRAME   -192
-#else
-# define        FRAME   -96
-#endif
-
-.align  32
-
-.global md5_block
-md5_block:
-        save    %sp,FRAME,%sp
-
-        ld      [Dptr],D
-        ld      [Cptr],C
-        ld      [Bptr],B
-        ld      [Aptr],A
-#ifdef ASI_PRIMARY_LITTLE
-        rd      %asi,%o7        ! How dare I? Well, I just do:-)
-        wr      %g0,ASI_PRIMARY_LITTLE,%asi
-#endif
-        LOAD    X(0),R0
-
-.Lmd5_block_loop:
-
-!!!!!!!!Round 0
-
-        xor     C,D,T1
-        sethi   %hi(0xd76aa478),T2
-        and     T1,B,T1
-        or      T2,%lo(0xd76aa478),T2   !=
-        xor     T1,D,T1
-        add     T1,R0,T1
-        LOAD    X(1),R1
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0xe8c7b756),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0xe8c7b756),T2
-        xor     T1,C,T1
-        LOAD    X(2),R2
-        add     T1,R1,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0x242070db),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0x242070db),T2
-        xor     T1,B,T1
-        add     T1,R2,T1                !=
-        LOAD    X(3),R3
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0xc1bdceee),T2
-        and     T1,C,T1
-        or      T2,%lo(0xc1bdceee),T2
-        xor     T1,A,T1                 !=
-        add     T1,R3,T1
-        LOAD    X(4),R4
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,22,T2
-        srl     B,32-22,B
-        or      B,T2,B
-         xor     C,D,T1                 !=
-        add     B,C,B
-
-        sethi   %hi(0xf57c0faf),T2
-        and     T1,B,T1
-        or      T2,%lo(0xf57c0faf),T2   !=
-        xor     T1,D,T1
-        add     T1,R4,T1
-        LOAD    X(5),R5
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0x4787c62a),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x4787c62a),T2
-        xor     T1,C,T1
-        LOAD    X(6),R6
-        add     T1,R5,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0xa8304613),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0xa8304613),T2
-        xor     T1,B,T1
-        add     T1,R6,T1                !=
-        LOAD    X(7),R7
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0xfd469501),T2
-        and     T1,C,T1
-        or      T2,%lo(0xfd469501),T2
-        xor     T1,A,T1                 !=
-        add     T1,R7,T1
-        LOAD    X(8),R8
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,22,T2
-        srl     B,32-22,B
-        or      B,T2,B
-         xor     C,D,T1                 !=
-        add     B,C,B
-
-        sethi   %hi(0x698098d8),T2
-        and     T1,B,T1
-        or      T2,%lo(0x698098d8),T2   !=
-        xor     T1,D,T1
-        add     T1,R8,T1
-        LOAD    X(9),R9
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0x8b44f7af),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x8b44f7af),T2
-        xor     T1,C,T1
-        LOAD    X(10),R10
-        add     T1,R9,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0xffff5bb1),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0xffff5bb1),T2
-        xor     T1,B,T1
-        add     T1,R10,T1               !=
-        LOAD    X(11),R11
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0x895cd7be),T2
-        and     T1,C,T1
-        or      T2,%lo(0x895cd7be),T2
-        xor     T1,A,T1                 !=
-        add     T1,R11,T1
-        LOAD    X(12),R12
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,22,T2
-        srl     B,32-22,B
-        or      B,T2,B
-         xor     C,D,T1                 !=
-        add     B,C,B
-
-        sethi   %hi(0x6b901122),T2
-        and     T1,B,T1
-        or      T2,%lo(0x6b901122),T2   !=
-        xor     T1,D,T1
-        add     T1,R12,T1
-        LOAD    X(13),R13
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0xfd987193),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0xfd987193),T2
-        xor     T1,C,T1
-        LOAD    X(14),RX
-        add     T1,R13,T1               !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0xa679438e),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0xa679438e),T2
-        xor     T1,B,T1
-        add     T1,RX,T1                !=
-        LOAD    X(15),RX
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0x49b40821),T2
-        and     T1,C,T1
-        or      T2,%lo(0x49b40821),T2
-        xor     T1,A,T1                 !=
-        add     T1,RX,T1
-        !pre-LOADed     X(1),R1
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,22,T2                 !=
-        srl     B,32-22,B
-        or      B,T2,B
-        add     B,C,B
-
-!!!!!!!!Round 1
-
-        xor     B,C,T1                  !=
-        sethi   %hi(0xf61e2562),T2
-        and     T1,D,T1
-        or      T2,%lo(0xf61e2562),T2
-        xor     T1,C,T1                 !=
-        add     T1,R1,T1
-        !pre-LOADed     X(6),R6
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,5,T2                  !=
-        srl     A,32-5,A
-        or      A,T2,A
-        add     A,B,A
-
-        xor     A,B,T1                  !=
-        sethi   %hi(0xc040b340),T2
-        and     T1,C,T1
-        or      T2,%lo(0xc040b340),T2
-        xor     T1,B,T1                 !=
-        add     T1,R6,T1
-        !pre-LOADed     X(11),R11
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,9,T2                  !=
-        srl     D,32-9,D
-        or      D,T2,D
-        add     D,A,D
-
-        xor     D,A,T1                  !=
-        sethi   %hi(0x265e5a51),T2
-        and     T1,B,T1
-        or      T2,%lo(0x265e5a51),T2
-        xor     T1,A,T1                 !=
-        add     T1,R11,T1
-        !pre-LOADed     X(0),R0
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,14,T2                 !=
-        srl     C,32-14,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0xe9b6c7aa),T2
-        and     T1,A,T1
-        or      T2,%lo(0xe9b6c7aa),T2
-        xor     T1,D,T1                 !=
-        add     T1,R0,T1
-        !pre-LOADed     X(5),R5
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,20,T2                 !=
-        srl     B,32-20,B
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1                  !=
-        sethi   %hi(0xd62f105d),T2
-        and     T1,D,T1
-        or      T2,%lo(0xd62f105d),T2
-        xor     T1,C,T1                 !=
-        add     T1,R5,T1
-        !pre-LOADed     X(10),R10
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,5,T2                  !=
-        srl     A,32-5,A
-        or      A,T2,A
-        add     A,B,A
-
-        xor     A,B,T1                  !=
-        sethi   %hi(0x02441453),T2
-        and     T1,C,T1
-        or      T2,%lo(0x02441453),T2
-        xor     T1,B,T1                 !=
-        add     T1,R10,T1
-        LOAD    X(15),RX
-        add     T1,T2,T1
-        add     D,T1,D                  !=
-        sll     D,9,T2
-        srl     D,32-9,D
-        or      D,T2,D
-        add     D,A,D                   !=
-
-        xor     D,A,T1
-        sethi   %hi(0xd8a1e681),T2
-        and     T1,B,T1
-        or      T2,%lo(0xd8a1e681),T2   !=
-        xor     T1,A,T1
-        add     T1,RX,T1
-        !pre-LOADed     X(4),R4
-        add     T1,T2,T1
-        add     C,T1,C                  !=
-        sll     C,14,T2
-        srl     C,32-14,C
-        or      C,T2,C
-        add     C,D,C                   !=
-
-        xor     C,D,T1
-        sethi   %hi(0xe7d3fbc8),T2
-        and     T1,A,T1
-        or      T2,%lo(0xe7d3fbc8),T2   !=
-        xor     T1,D,T1
-        add     T1,R4,T1
-        !pre-LOADed     X(9),R9
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,20,T2
-        srl     B,32-20,B
-        or      B,T2,B
-        add     B,C,B                   !=
-
-        xor     B,C,T1
-        sethi   %hi(0x21e1cde6),T2
-        and     T1,D,T1
-        or      T2,%lo(0x21e1cde6),T2   !=
-        xor     T1,C,T1
-        add     T1,R9,T1
-        LOAD    X(14),RX
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,5,T2
-        srl     A,32-5,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xc33707d6),T2
-        and     T1,C,T1                 !=
-        or      T2,%lo(0xc33707d6),T2
-        xor     T1,B,T1
-        add     T1,RX,T1
-        !pre-LOADed     X(3),R3
-        add     T1,T2,T1                !=
-        add     D,T1,D
-        sll     D,9,T2
-        srl     D,32-9,D
-        or      D,T2,D                  !=
-        add     D,A,D
-
-        xor     D,A,T1
-        sethi   %hi(0xf4d50d87),T2
-        and     T1,B,T1                 !=
-        or      T2,%lo(0xf4d50d87),T2
-        xor     T1,A,T1
-        add     T1,R3,T1
-        !pre-LOADed     X(8),R8
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,14,T2
-        srl     C,32-14,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        xor     C,D,T1
-        sethi   %hi(0x455a14ed),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x455a14ed),T2
-        xor     T1,D,T1
-        add     T1,R8,T1
-        !pre-LOADed     X(13),R13
-        add     T1,T2,T1                !=
-        add     B,T1,B
-        sll     B,20,T2
-        srl     B,32-20,B
-        or      B,T2,B                  !=
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0xa9e3e905),T2
-        and     T1,D,T1                 !=
-        or      T2,%lo(0xa9e3e905),T2
-        xor     T1,C,T1
-        add     T1,R13,T1
-        !pre-LOADed     X(2),R2
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,5,T2
-        srl     A,32-5,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xfcefa3f8),T2
-        and     T1,C,T1                 !=
-        or      T2,%lo(0xfcefa3f8),T2
-        xor     T1,B,T1
-        add     T1,R2,T1
-        !pre-LOADed     X(7),R7
-        add     T1,T2,T1                !=
-        add     D,T1,D
-        sll     D,9,T2
-        srl     D,32-9,D
-        or      D,T2,D                  !=
-        add     D,A,D
-
-        xor     D,A,T1
-        sethi   %hi(0x676f02d9),T2
-        and     T1,B,T1                 !=
-        or      T2,%lo(0x676f02d9),T2
-        xor     T1,A,T1
-        add     T1,R7,T1
-        !pre-LOADed     X(12),R12
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,14,T2
-        srl     C,32-14,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        xor     C,D,T1
-        sethi   %hi(0x8d2a4c8a),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x8d2a4c8a),T2
-        xor     T1,D,T1
-        add     T1,R12,T1
-        !pre-LOADed     X(5),R5
-        add     T1,T2,T1                !=
-        add     B,T1,B
-        sll     B,20,T2
-        srl     B,32-20,B
-        or      B,T2,B                  !=
-        add     B,C,B
-
-!!!!!!!!Round 2
-
-        xor     B,C,T1
-        sethi   %hi(0xfffa3942),T2
-        xor     T1,D,T1                 !=
-        or      T2,%lo(0xfffa3942),T2
-        add     T1,R5,T1
-        !pre-LOADed     X(8),R8
-        add     T1,T2,T1
-        add     A,T1,A                  !=
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A
-        add     A,B,A                   !=
-
-        xor     A,B,T1
-        sethi   %hi(0x8771f681),T2
-        xor     T1,C,T1
-        or      T2,%lo(0x8771f681),T2   !=
-        add     T1,R8,T1
-        !pre-LOADed     X(11),R11
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,11,T2                 !=
-        srl     D,32-11,D
-        or      D,T2,D
-        add     D,A,D
-
-        xor     D,A,T1                  !=
-        sethi   %hi(0x6d9d6122),T2
-        xor     T1,B,T1
-        or      T2,%lo(0x6d9d6122),T2
-        add     T1,R11,T1               !=
-        LOAD    X(14),RX
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,16,T2                 !=
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0xfde5380c),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xfde5380c),T2
-        add     T1,RX,T1                !=
-        !pre-LOADed     X(1),R1
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2
-        srl     B,32-23,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0xa4beea44),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0xa4beea44),T2
-        add     T1,R1,T1
-        !pre-LOADed     X(4),R4
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0x4bdecfa9),T2
-        xor     T1,C,T1                 !=
-        or      T2,%lo(0x4bdecfa9),T2
-        add     T1,R4,T1
-        !pre-LOADed     X(7),R7
-        add     T1,T2,T1
-        add     D,T1,D                  !=
-        sll     D,11,T2
-        srl     D,32-11,D
-        or      D,T2,D
-        add     D,A,D                   !=
-
-        xor     D,A,T1
-        sethi   %hi(0xf6bb4b60),T2
-        xor     T1,B,T1
-        or      T2,%lo(0xf6bb4b60),T2   !=
-        add     T1,R7,T1
-        !pre-LOADed     X(10),R10
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,16,T2                 !=
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0xbebfbc70),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xbebfbc70),T2
-        add     T1,R10,T1               !=
-        !pre-LOADed     X(13),R13
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2
-        srl     B,32-23,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0x289b7ec6),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0x289b7ec6),T2
-        add     T1,R13,T1
-        !pre-LOADed     X(0),R0
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xeaa127fa),T2
-        xor     T1,C,T1                 !=
-        or      T2,%lo(0xeaa127fa),T2
-        add     T1,R0,T1
-        !pre-LOADed     X(3),R3
-        add     T1,T2,T1
-        add     D,T1,D                  !=
-        sll     D,11,T2
-        srl     D,32-11,D
-        or      D,T2,D
-        add     D,A,D                   !=
-
-        xor     D,A,T1
-        sethi   %hi(0xd4ef3085),T2
-        xor     T1,B,T1
-        or      T2,%lo(0xd4ef3085),T2   !=
-        add     T1,R3,T1
-        !pre-LOADed     X(6),R6
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,16,T2                 !=
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0x04881d05),T2
-        xor     T1,A,T1
-        or      T2,%lo(0x04881d05),T2
-        add     T1,R6,T1                !=
-        !pre-LOADed     X(9),R9
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2
-        srl     B,32-23,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0xd9d4d039),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0xd9d4d039),T2
-        add     T1,R9,T1
-        !pre-LOADed     X(12),R12
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xe6db99e5),T2
-        xor     T1,C,T1                 !=
-        or      T2,%lo(0xe6db99e5),T2
-        add     T1,R12,T1
-        LOAD    X(15),RX
-        add     T1,T2,T1                !=
-        add     D,T1,D
-        sll     D,11,T2
-        srl     D,32-11,D
-        or      D,T2,D                  !=
-        add     D,A,D
-
-        xor     D,A,T1
-        sethi   %hi(0x1fa27cf8),T2
-        xor     T1,B,T1                 !=
-        or      T2,%lo(0x1fa27cf8),T2
-        add     T1,RX,T1
-        !pre-LOADed     X(2),R2
-        add     T1,T2,T1
-        add     C,T1,C                  !=
-        sll     C,16,T2
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C                   !=
-
-        xor     C,D,T1
-        sethi   %hi(0xc4ac5665),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xc4ac5665),T2   !=
-        add     T1,R2,T1
-        !pre-LOADed     X(0),R0
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2                 !=
-        srl     B,32-23,B
-        or      B,T2,B
-        add     B,C,B
-
-!!!!!!!!Round 3
-
-        orn     B,D,T1                  !=
-        sethi   %hi(0xf4292244),T2
-        xor     T1,C,T1
-        or      T2,%lo(0xf4292244),T2
-        add     T1,R0,T1                !=
-        !pre-LOADed     X(7),R7
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,6,T2
-        srl     A,32-6,A                !=
-        or      A,T2,A
-        add     A,B,A
-
-        orn     A,C,T1
-        sethi   %hi(0x432aff97),T2      !=
-        xor     T1,B,T1
-        or      T2,%lo(0x432aff97),T2
-        LOAD    X(14),RX
-        add     T1,R7,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2
-        srl     D,32-10,D               !=
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1
-        sethi   %hi(0xab9423a7),T2      !=
-        xor     T1,A,T1
-        or      T2,%lo(0xab9423a7),T2
-        add     T1,RX,T1
-        !pre-LOADed     X(5),R5
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,15,T2
-        srl     C,32-15,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0xfc93a039),T2
-        xor     T1,D,T1                 !=
-        or      T2,%lo(0xfc93a039),T2
-        add     T1,R5,T1
-        !pre-LOADed     X(12),R12
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,21,T2
-        srl     B,32-21,B
-        or      B,T2,B
-        add     B,C,B                   !=
-
-        orn     B,D,T1
-        sethi   %hi(0x655b59c3),T2
-        xor     T1,C,T1
-        or      T2,%lo(0x655b59c3),T2   !=
-        add     T1,R12,T1
-        !pre-LOADed     X(3),R3
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,6,T2                  !=
-        srl     A,32-6,A
-        or      A,T2,A
-        add     A,B,A
-
-        orn     A,C,T1                  !=
-        sethi   %hi(0x8f0ccc92),T2
-        xor     T1,B,T1
-        or      T2,%lo(0x8f0ccc92),T2
-        add     T1,R3,T1                !=
-        !pre-LOADed     X(10),R10
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2
-        srl     D,32-10,D               !=
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1
-        sethi   %hi(0xffeff47d),T2      !=
-        xor     T1,A,T1
-        or      T2,%lo(0xffeff47d),T2
-        add     T1,R10,T1
-        !pre-LOADed     X(1),R1
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,15,T2
-        srl     C,32-15,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0x85845dd1),T2
-        xor     T1,D,T1                 !=
-        or      T2,%lo(0x85845dd1),T2
-        add     T1,R1,T1
-        !pre-LOADed     X(8),R8
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,21,T2
-        srl     B,32-21,B
-        or      B,T2,B
-        add     B,C,B                   !=
-
-        orn     B,D,T1
-        sethi   %hi(0x6fa87e4f),T2
-        xor     T1,C,T1
-        or      T2,%lo(0x6fa87e4f),T2   !=
-        add     T1,R8,T1
-        LOAD    X(15),RX
-        add     T1,T2,T1
-        add     A,T1,A                  !=
-        sll     A,6,T2
-        srl     A,32-6,A
-        or      A,T2,A
-        add     A,B,A                   !=
-
-        orn     A,C,T1
-        sethi   %hi(0xfe2ce6e0),T2
-        xor     T1,B,T1
-        or      T2,%lo(0xfe2ce6e0),T2   !=
-        add     T1,RX,T1
-        !pre-LOADed     X(6),R6
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2                 !=
-        srl     D,32-10,D
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1                  !=
-        sethi   %hi(0xa3014314),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xa3014314),T2
-        add     T1,R6,T1                !=
-        !pre-LOADed     X(13),R13
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,15,T2
-        srl     C,32-15,C               !=
-        or      C,T2,C
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0x4e0811a1),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0x4e0811a1),T2
-        !pre-LOADed     X(4),R4
-         ld      [Aptr],Aval
-        add     T1,R13,T1               !=
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,21,T2
-        srl     B,32-21,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        orn     B,D,T1
-        sethi   %hi(0xf7537e82),T2      !=
-        xor     T1,C,T1
-        or      T2,%lo(0xf7537e82),T2
-        !pre-LOADed     X(11),R11
-         ld      [Dptr],Dval
-        add     T1,R4,T1                !=
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,6,T2
-        srl     A,32-6,A                !=
-        or      A,T2,A
-        add     A,B,A
-
-        orn     A,C,T1
-        sethi   %hi(0xbd3af235),T2      !=
-        xor     T1,B,T1
-        or      T2,%lo(0xbd3af235),T2
-        !pre-LOADed     X(2),R2
-         ld      [Cptr],Cval
-        add     T1,R11,T1               !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2
-        srl     D,32-10,D               !=
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1
-        sethi   %hi(0x2ad7d2bb),T2      !=
-        xor     T1,A,T1
-        or      T2,%lo(0x2ad7d2bb),T2
-        !pre-LOADed     X(9),R9
-         ld      [Bptr],Bval
-        add     T1,R2,T1                !=
-         add     Aval,A,Aval
-        add     T1,T2,T1
-         st      Aval,[Aptr]
-        add     C,T1,C                  !=
-        sll     C,15,T2
-         add     Dval,D,Dval
-        srl     C,32-15,C
-        or      C,T2,C                  !=
-         st      Dval,[Dptr]
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0xeb86d391),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0xeb86d391),T2
-        add     T1,R9,T1
-        !pre-LOADed     X(0),R0
-         mov     Aval,A                 !=
-        add     T1,T2,T1
-         mov     Dval,D
-        add     B,T1,B
-        sll     B,21,T2                 !=
-         add     Cval,C,Cval
-        srl     B,32-21,B
-         st      Cval,[Cptr]
-        or      B,T2,B                  !=
-        add     B,C,B
-
-        deccc   %i2
-        mov     Cval,C
-        add     B,Bval,B                !=
-        inc     64,%i1
-        nop
-        st      B,[Bptr]
-        nop                             !=
-
-#ifdef  OPENSSL_SYSNAME_ULTRASPARC
-        bg,a,pt %icc,.Lmd5_block_loop
-#else
-        bg,a    .Lmd5_block_loop
-#endif
-        LOAD    X(0),R0
-
-#ifdef ASI_PRIMARY_LITTLE
-        wr      %g0,%o7,%asi
-#endif
-        ret
-        restore %g0,0,%o0
-
-.type   md5_block,#function
-.size   md5_block,(.-md5_block)
diff --git a/src/lib/libcrypto/err/err_bio.c b/src/lib/libcrypto/mdc2/mdc2_one.c
index a42f804840..72647f67ed 100644
--- a/src/lib/libcrypto/err/err_bio.c
+++ b/src/lib/libcrypto/mdc2/mdc2_one.c
@@ -1,4 +1,4 @@
-/* crypto/err/err_prn.c */
+/* crypto/mdc2/mdc2_one.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -58,18 +58,19 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/crypto.h>
-#include <openssl/buffer.h>
-#include <openssl/err.h>
+#include <openssl/mdc2.h>
 
-static int print_bio(const char *str, size_t len, void *bp)
+unsigned char *MDC2(const unsigned char *d, size_t n, unsigned char *md)
         {
-        return BIO_write((BIO *)bp, str, len);
-        }
-void ERR_print_errors(BIO *bp)
-        {
-        ERR_print_errors_cb(print_bio, bp);
+        MDC2_CTX c;
+        static unsigned char m[MDC2_DIGEST_LENGTH];
+
+        if (md == NULL) md=m;
+        if (!MDC2_Init(&c))
+                return NULL;
+        MDC2_Update(&c,d,n);
+        MDC2_Final(md,&c);
+        OPENSSL_cleanse(&c,sizeof(c)); /* security consideration */
+        return(md);
         }
 
-        
diff --git a/src/lib/libssl/src/fips/dsa/fips_dsa_key.c b/src/lib/libcrypto/mdc2/mdc2dgst.c
index b5f8cfa1d0..4aa406edc3 100644
--- a/src/lib/libssl/src/fips/dsa/fips_dsa_key.c
+++ b/src/lib/libcrypto/mdc2/mdc2dgst.c
@@ -1,4 +1,4 @@
-/* crypto/dsa/dsa_key.c */
+/* crypto/mdc2/mdc2dgst.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,113 +57,143 @@
  */
 
 #include <stdio.h>
-#include <time.h>
-#ifndef OPENSSL_NO_SHA
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/fips.h>
-#include "fips_locl.h"
-
-#ifdef OPENSSL_FIPS
-
-static int fips_dsa_pairwise_fail = 0;
-
-void FIPS_corrupt_dsa_keygen(void)
+#include <stdlib.h>
+#include <string.h>
+#include <openssl/des.h>
+#include <openssl/mdc2.h>
+
+#undef c2l
+#define c2l(c,l)        (l =((DES_LONG)(*((c)++)))    , \
+                         l|=((DES_LONG)(*((c)++)))<< 8L, \
+                         l|=((DES_LONG)(*((c)++)))<<16L, \
+                         l|=((DES_LONG)(*((c)++)))<<24L)
+
+#undef l2c
+#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
+                        *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
+                        *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
+                        *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+
+static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
+int MDC2_Init(MDC2_CTX *c)
         {
-        fips_dsa_pairwise_fail = 1;
+        c->num=0;
+        c->pad_type=1;
+        memset(&(c->h[0]),0x52,MDC2_BLOCK);
+        memset(&(c->hh[0]),0x25,MDC2_BLOCK);
+        return 1;
         }
 
-static int dsa_builtin_keygen(DSA *dsa);
-
-int fips_check_dsa(DSA *dsa)
+int MDC2_Update(MDC2_CTX *c, const unsigned char *in, size_t len)
         {
-        EVP_PKEY pk;
-        unsigned char tbs[] = "DSA Pairwise Check Data";
-        pk.type = EVP_PKEY_DSA;
-        pk.pkey.dsa = dsa;
+        size_t i,j;
 
-        if (!fips_pkey_signature_test(&pk, tbs, -1,
-                                        NULL, 0, EVP_dss1(), 0, NULL))
+        i=c->num;
+        if (i != 0)
                 {
-                FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
-                fips_set_selftest_fail();
-                return 0;
+                if (i+len < MDC2_BLOCK)
+                        {
+                        /* partial block */
+                        memcpy(&(c->data[i]),in,len);
+                        c->num+=(int)len;
+                        return 1;
+                        }
+                else
+                        {
+                        /* filled one */
+                        j=MDC2_BLOCK-i;
+                        memcpy(&(c->data[i]),in,j);
+                        len-=j;
+                        in+=j;
+                        c->num=0;
+                        mdc2_body(c,&(c->data[0]),MDC2_BLOCK);
+                        }
+                }
+        i=len&~((size_t)MDC2_BLOCK-1);
+        if (i > 0) mdc2_body(c,in,i);
+        j=len-i;
+        if (j > 0)
+                {
+                memcpy(&(c->data[0]),&(in[i]),j);
+                c->num=(int)j;
                 }
         return 1;
         }
 
-int DSA_generate_key(DSA *dsa)
-        {
-        if(dsa->meth->dsa_keygen)
-                return dsa->meth->dsa_keygen(dsa);
-        return dsa_builtin_keygen(dsa);
-        }
-
-static int dsa_builtin_keygen(DSA *dsa)
+static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len)
         {
-        int ok=0;
-        BN_CTX *ctx=NULL;
-        BIGNUM *pub_key=NULL,*priv_key=NULL;
-
-        if (FIPS_mode() && (BN_num_bits(dsa->p) < OPENSSL_DSA_FIPS_MIN_MODULUS_BITS))
+        register DES_LONG tin0,tin1;
+        register DES_LONG ttin0,ttin1;
+        DES_LONG d[2],dd[2];
+        DES_key_schedule k;
+        unsigned char *p;
+        size_t i;
+
+        for (i=0; i<len; i+=8)
                 {
-                DSAerr(DSA_F_DSA_BUILTIN_KEYGEN, DSA_R_KEY_SIZE_TOO_SMALL);
-                goto err;
+                c2l(in,tin0); d[0]=dd[0]=tin0;
+                c2l(in,tin1); d[1]=dd[1]=tin1;
+                c->h[0]=(c->h[0]&0x9f)|0x40;
+                c->hh[0]=(c->hh[0]&0x9f)|0x20;
+
+                DES_set_odd_parity(&c->h);
+                DES_set_key_unchecked(&c->h,&k);
+                DES_encrypt1(d,&k,1);
+
+                DES_set_odd_parity(&c->hh);
+                DES_set_key_unchecked(&c->hh,&k);
+                DES_encrypt1(dd,&k,1);
+
+                ttin0=tin0^dd[0];
+                ttin1=tin1^dd[1];
+                tin0^=d[0];
+                tin1^=d[1];
+
+                p=c->h;
+                l2c(tin0,p);
+                l2c(ttin1,p);
+                p=c->hh;
+                l2c(ttin0,p);
+                l2c(tin1,p);
                 }
+        }
 
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
+int MDC2_Final(unsigned char *md, MDC2_CTX *c)
+        {
+        unsigned int i;
+        int j;
 
-        if (dsa->priv_key == NULL)
+        i=c->num;
+        j=c->pad_type;
+        if ((i > 0) || (j == 2))
                 {
-                if ((priv_key=BN_new()) == NULL) goto err;
+                if (j == 2)
+                        c->data[i++]=0x80;
+                memset(&(c->data[i]),0,MDC2_BLOCK-i);
+                mdc2_body(c,c->data,MDC2_BLOCK);
                 }
-        else
-                priv_key=dsa->priv_key;
+        memcpy(md,(char *)c->h,MDC2_BLOCK);
+        memcpy(&(md[MDC2_BLOCK]),(char *)c->hh,MDC2_BLOCK);
+        return 1;
+        }
 
-        do
-                if (!BN_rand_range(priv_key,dsa->q)) goto err;
-        while (BN_is_zero(priv_key));
+#undef TEST
 
-        if (dsa->pub_key == NULL)
-                {
-                if ((pub_key=BN_new()) == NULL) goto err;
-                }
-        else
-                pub_key=dsa->pub_key;
-        
+#ifdef TEST
+main()
         {
-                BIGNUM local_prk;
-                BIGNUM *prk;
-
-                if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
-                        {
-                        BN_init(&local_prk);
-                        prk = &local_prk;
-                        BN_with_flags(prk, priv_key, BN_FLG_CONSTTIME);
-                        }
-                else
-                        prk = priv_key;
-
-                if (!BN_mod_exp(pub_key,dsa->g,prk,dsa->p,ctx)) goto err;
+        unsigned char md[MDC2_DIGEST_LENGTH];
+        int i;
+        MDC2_CTX c;
+        static char *text="Now is the time for all ";
+
+        MDC2_Init(&c);
+        MDC2_Update(&c,text,strlen(text));
+        MDC2_Final(&(md[0]),&c);
+
+        for (i=0; i<MDC2_DIGEST_LENGTH; i++)
+                printf("%02X",md[i]);
+        printf("\n");
         }
 
-        dsa->priv_key=priv_key;
-        dsa->pub_key=pub_key;
-        if (fips_dsa_pairwise_fail)
-                BN_add_word(dsa->pub_key, 1);
-        if(!fips_check_dsa(dsa))
-            goto err;
-        ok=1;
-
-err:
-        if ((pub_key != NULL) && (dsa->pub_key == NULL)) BN_free(pub_key);
-        if ((priv_key != NULL) && (dsa->priv_key == NULL)) BN_free(priv_key);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        return(ok);
-        }
-#endif
-
 #endif
diff --git a/src/lib/libcrypto/modes/Makefile b/src/lib/libcrypto/modes/Makefile
new file mode 100644
index 0000000000..6c85861b6c
--- /dev/null
+++ b/src/lib/libcrypto/modes/Makefile
@@ -0,0 +1,82 @@
+#
+# OpenSSL/crypto/modes/Makefile
+#
+
+DIR=    modes
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= cbc128.c ctr128.c cts128.c cfb128.c ofb128.c
+LIBOBJ= cbc128.o ctr128.o cts128.o cfb128.o ofb128.o
+
+SRC= $(LIBSRC)
+
+#EXHEADER= store.h str_compat.h
+EXHEADER= modes.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+cbc128.o: cbc128.c modes.h
+cfb128.o: cfb128.c modes.h
+ctr128.o: ctr128.c modes.h
+cts128.o: cts128.c modes.h
+ofb128.o: modes.h ofb128.c
diff --git a/src/lib/libcrypto/o_dir.c b/src/lib/libcrypto/o_dir.c
new file mode 100644
index 0000000000..42891ea459
--- /dev/null
+++ b/src/lib/libcrypto/o_dir.c
@@ -0,0 +1,83 @@
+/* crypto/o_dir.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <errno.h>
+#include <e_os.h>
+
+/* The routines really come from the Levitte Programming, so to make
+   life simple, let's just use the raw files and hack the symbols to
+   fit our namespace.  */
+#define LP_DIR_CTX OPENSSL_DIR_CTX
+#define LP_dir_context_st OPENSSL_dir_context_st
+#define LP_find_file OPENSSL_DIR_read
+#define LP_find_file_end OPENSSL_DIR_end
+
+#include "o_dir.h"
+
+#define LPDIR_H
+#if defined OPENSSL_SYS_UNIX || defined DJGPP
+#include "LPdir_unix.c"
+#elif defined OPENSSL_SYS_VMS
+#include "LPdir_vms.c"
+#elif defined OPENSSL_SYS_WIN32
+#include "LPdir_win32.c"
+#elif defined OPENSSL_SYS_WINCE
+#include "LPdir_wince.c"
+#else
+#include "LPdir_nyi.c"
+#endif
diff --git a/src/lib/libcrypto/o_dir.h b/src/lib/libcrypto/o_dir.h
new file mode 100644
index 0000000000..4b725c0312
--- /dev/null
+++ b/src/lib/libcrypto/o_dir.h
@@ -0,0 +1,53 @@
+/* crypto/o_dir.h -*- mode:C; c-file-style: "eay" -*- */
+/* Copied from Richard Levitte's (richard@levitte.org) LP library.  All
+ * symbol names have been changed, with permission from the author.
+ */
+
+/* $LP: LPlib/source/LPdir.h,v 1.1 2004/06/14 08:56:04 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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.
+ */
+
+
+#ifndef O_DIR_H
+#define O_DIR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;
+
+  /* returns NULL on error or end-of-directory.
+     If it is end-of-directory, errno will be zero */
+  const char *OPENSSL_DIR_read(OPENSSL_DIR_CTX **ctx, const char *directory);
+  /* returns 1 on success, 0 on error */
+  int OPENSSL_DIR_end(OPENSSL_DIR_CTX **ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LPDIR_H */
diff --git a/src/lib/libcrypto/o_dir_test.c b/src/lib/libcrypto/o_dir_test.c
new file mode 100644
index 0000000000..3d75ecb005
--- /dev/null
+++ b/src/lib/libcrypto/o_dir_test.c
@@ -0,0 +1,70 @@
+/* crypto/o_dir.h -*- mode:C; c-file-style: "eay" -*- */
+/* Copied from Richard Levitte's (richard@levitte.org) LP library.  All
+ * symbol names have been changed, with permission from the author.
+ */
+
+/* $LP: LPlib/test/test_dir.c,v 1.1 2004/06/16 22:59:47 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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.
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include "e_os2.h"
+#include "o_dir.h"
+
+#if defined OPENSSL_SYS_UNIX || defined OPENSSL_SYS_WIN32 || defined OPENSSL_SYS_WINCE
+#define CURRDIR "."
+#elif defined OPENSSL_SYS_VMS
+#define CURRDIR "SYS$DISK:[]"
+#else
+#error "No supported platform defined!"
+#endif
+
+int main()
+{
+  OPENSSL_DIR_CTX *ctx = NULL;
+  const char *result;
+
+  while((result = OPENSSL_DIR_read(&ctx, CURRDIR)) != NULL)
+    {
+      printf("%s\n", result);
+    }
+
+  if (errno)
+    {
+      perror("test_dir");
+      exit(1);
+    }
+
+  if (!OPENSSL_DIR_end(&ctx))
+    {
+      perror("test_dir");
+      exit(2);
+    }
+  exit(0);
+}
diff --git a/src/lib/libcrypto/perlasm/alpha.pl b/src/lib/libcrypto/perlasm/alpha.pl
deleted file mode 100644
index 3dac571743..0000000000
--- a/src/lib/libcrypto/perlasm/alpha.pl
+++ /dev/null
@@ -1,434 +0,0 @@
-#!/usr/local/bin/perl
-
-package alpha;
-use Carp qw(croak cluck);
-
-$label="100";
-
-$n_debug=0;
-$smear_regs=1;
-$reg_alloc=1;
-
-$align="3";
-$com_start="#";
-
-sub main'asm_init_output { @out=(); }
-sub main'asm_get_output { return(@out); }
-sub main'get_labels { return(@labels); }
-sub main'external_label { push(@labels,@_); }
-
-# General registers
-
-%regs=( 'r0',   '$0',
-        'r1',   '$1',
-        'r2',   '$2',
-        'r3',   '$3',
-        'r4',   '$4',
-        'r5',   '$5',
-        'r6',   '$6',
-        'r7',   '$7',
-        'r8',   '$8',
-        'r9',   '$22',
-        'r10',  '$23',
-        'r11',  '$24',
-        'r12',  '$25',
-        'r13',  '$27',
-        'r14',  '$28',
-        'r15',  '$21', # argc == 5
-        'r16',  '$20', # argc == 4
-        'r17',  '$19', # argc == 3
-        'r18',  '$18', # argc == 2
-        'r19',  '$17', # argc == 1
-        'r20',  '$16', # argc == 0
-        'r21',  '$9',  # save 0
-        'r22',  '$10', # save 1
-        'r23',  '$11', # save 2
-        'r24',  '$12', # save 3
-        'r25',  '$13', # save 4
-        'r26',  '$14', # save 5
-
-        'a0',   '$16',
-        'a1',   '$17',
-        'a2',   '$18',
-        'a3',   '$19',
-        'a4',   '$20',
-        'a5',   '$21',
-
-        's0',   '$9',
-        's1',   '$10',
-        's2',   '$11',
-        's3',   '$12',
-        's4',   '$13',
-        's5',   '$14',
-        'zero', '$31',
-        'sp',   '$30',
-        );
-
-$main'reg_s0="r21";
-$main'reg_s1="r22";
-$main'reg_s2="r23";
-$main'reg_s3="r24";
-$main'reg_s4="r25";
-$main'reg_s5="r26";
-
-@reg=(  '$0', '$1' ,'$2' ,'$3' ,'$4' ,'$5' ,'$6' ,'$7' ,'$8',
-        '$22','$23','$24','$25','$20','$21','$27','$28');
-
-
-sub main'sub    { &out3("subq",@_); }
-sub main'add    { &out3("addq",@_); }
-sub main'mov    { &out3("bis",$_[0],$_[0],$_[1]); }
-sub main'or     { &out3("bis",@_); }
-sub main'bis    { &out3("bis",@_); }
-sub main'br     { &out1("br",@_); }
-sub main'ld     { &out2("ldq",@_); }
-sub main'st     { &out2("stq",@_); }
-sub main'cmpult { &out3("cmpult",@_); }
-sub main'cmplt  { &out3("cmplt",@_); }
-sub main'bgt    { &out2("bgt",@_); }
-sub main'ble    { &out2("ble",@_); }
-sub main'blt    { &out2("blt",@_); }
-sub main'mul    { &out3("mulq",@_); }
-sub main'muh    { &out3("umulh",@_); }
-
-$main'QWS=8;
-
-sub main'asm_add
-        {
-        push(@out,@_);
-        }
-
-sub main'asm_finish
-        {
-        &main'file_end();
-        print &main'asm_get_output();
-        }
-
-sub main'asm_init
-        {
-        ($type,$fn)=@_;
-        $filename=$fn;
-
-        &main'asm_init_output();
-        &main'comment("Don't even think of reading this code");
-        &main'comment("It was automatically generated by $filename");
-        &main'comment("Which is a perl program used to generate the alpha assember.");
-        &main'comment("eric <eay\@cryptsoft.com>");
-        &main'comment("");
-
-        $filename =~ s/\.pl$//;
-        &main'file($filename);
-        }
-
-sub conv
-        {
-        local($r)=@_;
-        local($v);
-
-        return($regs{$r}) if defined($regs{$r});
-        return($r);
-        }
-
-sub main'QWPw
-        {
-        local($off,$reg)=@_;
-
-        return(&main'QWP($off*8,$reg));
-        }
-
-sub main'QWP
-        {
-        local($off,$reg)=@_;
-
-        $ret="$off(".&conv($reg).")";
-        return($ret);
-        }
-
-sub out3
-        {
-        local($name,$p1,$p2,$p3)=@_;
-
-        $p1=&conv($p1);
-        $p2=&conv($p2);
-        $p3=&conv($p3);
-        push(@out,"\t$name\t");
-        $l=length($p1)+1;
-        push(@out,$p1.",");
-        $ll=3-($l+9)/8;
-        $tmp1=sprintf("\t" x $ll);
-        push(@out,$tmp1);
-
-        $l=length($p2)+1;
-        push(@out,$p2.",");
-        $ll=3-($l+9)/8;
-        $tmp1=sprintf("\t" x $ll);
-        push(@out,$tmp1);
-
-        push(@out,&conv($p3)."\n");
-        }
-
-sub out2
-        {
-        local($name,$p1,$p2,$p3)=@_;
-
-        $p1=&conv($p1);
-        $p2=&conv($p2);
-        push(@out,"\t$name\t");
-        $l=length($p1)+1;
-        push(@out,$p1.",");
-        $ll=3-($l+9)/8;
-        $tmp1=sprintf("\t" x $ll);
-        push(@out,$tmp1);
-
-        push(@out,&conv($p2)."\n");
-        }
-
-sub out1
-        {
-        local($name,$p1)=@_;
-
-        $p1=&conv($p1);
-        push(@out,"\t$name\t".$p1."\n");
-        }
-
-sub out0
-        {
-        push(@out,"\t$_[0]\n");
-        }
-
-sub main'file
-        {
-        local($file)=@_;
-
-        local($tmp)=<<"EOF";
- # DEC Alpha assember
- # Generated from perl scripts contains in SSLeay
-        .file   1 "$file.s"
-        .set noat
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'function_begin
-        {
-        local($func)=@_;
-
-print STDERR "$func\n";
-        local($tmp)=<<"EOF";
-        .text
-        .align $align
-        .globl $func
-        .ent $func
-${func}:
-${func}..ng:
-        .frame \$30,0,\$26,0
-        .prologue 0
-EOF
-        push(@out,$tmp);
-        $stack=0;
-        }
-
-sub main'function_end
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-        ret     \$31,(\$26),1
-        .end $func
-EOF
-        push(@out,$tmp);
-        $stack=0;
-        %label=();
-        }
-
-sub main'function_end_A
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-        ret     \$31,(\$26),1
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'function_end_B
-        {
-        local($func)=@_;
-
-        $func=$under.$func;
-
-        push(@out,"\t.end $func\n");
-        $stack=0;
-        %label=();
-        }
-
-sub main'wparam
-        {
-        local($num)=@_;
-
-        if ($num < 6)
-                {
-                $num=20-$num;
-                return("r$num");
-                }
-        else
-                { return(&main'QWP($stack+$num*8,"sp")); }
-        }
-
-sub main'stack_push
-        {
-        local($num)=@_;
-        $stack+=$num*8;
-        &main'sub("sp",$num*8,"sp");
-        }
-
-sub main'stack_pop
-        {
-        local($num)=@_;
-        $stack-=$num*8;
-        &main'add("sp",$num*8,"sp");
-        }
-
-sub main'swtmp
-        {
-        return(&main'QWP(($_[0])*8,"sp"));
-        }
-
-# Should use swtmp, which is above sp.  Linix can trash the stack above esp
-#sub main'wtmp
-#       {
-#       local($num)=@_;
-#
-#       return(&main'QWP(-($num+1)*4,"esp","",0));
-#       }
-
-sub main'comment
-        {
-        foreach (@_)
-                {
-                if (/^\s*$/)
-                        { push(@out,"\n"); }
-                else
-                        { push(@out,"\t$com_start $_ $com_end\n"); }
-                }
-        }
-
-sub main'label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}=$label;
-                $label++;
-                }
-        return('$'.$label{$_[0]});
-        }
-
-sub main'set_label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}=$label;
-                $label++;
-                }
-#       push(@out,".align $align\n") if ($_[1] != 0);
-        push(@out,'$'."$label{$_[0]}:\n");
-        }
-
-sub main'file_end
-        {
-        }
-
-sub main'data_word
-        {
-        push(@out,"\t.long $_[0]\n");
-        }
-
-@pool_free=();
-@pool_taken=();
-$curr_num=0;
-$max=0;
-
-sub main'init_pool
-        {
-        local($args)=@_;
-        local($i);
-
-        @pool_free=();
-        for ($i=(14+(6-$args)); $i >= 0; $i--)
-                {
-                push(@pool_free,"r$i");
-                }
-        print STDERR "START :register pool:@pool_free\n";
-        $curr_num=$max=0;
-        }
-
-sub main'fin_pool
-        {
-        printf STDERR "END %2d:register pool:@pool_free\n",$max;
-        }
-
-sub main'GR
-        {
-        local($r)=@_;
-        local($i,@n,$_);
-
-        foreach (@pool_free)
-                {
-                if ($r ne $_)
-                        { push(@n,$_); }
-                else
-                        {
-                        $curr_num++;
-                        $max=$curr_num if ($curr_num > $max);
-                        }
-                }
-        @pool_free=@n;
-print STDERR "GR:@pool_free\n" if $reg_alloc;
-        return(@_);
-        }
-
-sub main'NR
-        {
-        local($num)=@_;
-        local(@ret);
-
-        $num=1 if $num == 0;
-        ($#pool_free >= ($num-1)) || croak "out of registers: want $num, have @pool_free";
-        while ($num > 0)
-                {
-                push(@ret,pop @pool_free);
-                $curr_num++;
-                $max=$curr_num if ($curr_num > $max);
-                $num--
-                }
-        print STDERR "nr @ret\n" if $n_debug;
-print STDERR "NR:@pool_free\n" if $reg_alloc;
-        return(@ret);
-
-        }
-
-sub main'FR
-        {
-        local(@r)=@_;
-        local(@a,$v,$w);
-
-        print STDERR "fr @r\n" if $n_debug;
-#       cluck "fr @r";
-        for $w (@pool_free)
-                {
-                foreach $v (@r)
-                        {
-                        croak "double register free of $v (@pool_free)" if $w eq $v;
-                        }
-                }
-        foreach $v (@r)
-                {
-                croak "bad argument to FR" if ($v !~ /^r\d+$/);
-                if ($smear_regs)
-                        { unshift(@pool_free,$v); }
-                else    { push(@pool_free,$v); }
-                $curr_num--;
-                }
-print STDERR "FR:@pool_free\n" if $reg_alloc;
-        }
-1;
diff --git a/src/lib/libcrypto/perlasm/x86masm.pl b/src/lib/libcrypto/perlasm/x86masm.pl
new file mode 100644
index 0000000000..3d50e4a786
--- /dev/null
+++ b/src/lib/libcrypto/perlasm/x86masm.pl
@@ -0,0 +1,184 @@
+#!/usr/bin/env perl
+
+package x86masm;
+
+*out=\@::out;
+
+$::lbdecor="\$L";       # local label decoration
+$nmdecor="_";           # external name decoration
+
+$initseg="";
+$segment="";
+
+sub ::generic
+{ my ($opcode,@arg)=@_;
+
+    # fix hexadecimal constants
+    for (@arg) { s/0x([0-9a-f]+)/0$1h/oi; }
+
+    if ($opcode !~ /movq/)
+    {   # fix xmm references
+        $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
+        $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
+    }
+
+    &::emit($opcode,@arg);
+  1;
+}
+#
+# opcodes not covered by ::generic above, mostly inconsistent namings...
+#
+sub ::call      { &::emit("call",(&::islabel($_[0]) or "$nmdecor$_[0]")); }
+sub ::call_ptr  { &::emit("call",@_);   }
+sub ::jmp_ptr   { &::emit("jmp",@_);    }
+
+sub get_mem
+{ my($size,$addr,$reg1,$reg2,$idx)=@_;
+  my($post,$ret);
+
+    $ret .= "$size PTR " if ($size ne "");
+
+    $addr =~ s/^\s+//;
+    # prepend global references with optional underscore
+    $addr =~ s/^([^\+\-0-9][^\+\-]*)/&::islabel($1) or "$nmdecor$1"/ige;
+    # put address arithmetic expression in parenthesis
+    $addr="($addr)" if ($addr =~ /^.+[\-\+].+$/);
+
+    if (($addr ne "") && ($addr ne 0))
+    {   if ($addr !~ /^-/)      { $ret .= "$addr";  }
+        else                    { $post=$addr;      }
+    }
+    $ret .= "[";
+
+    if ($reg2 ne "")
+    {   $idx!=0 or $idx=1;
+        $ret .= "$reg2*$idx";
+        $ret .= "+$reg1" if ($reg1 ne "");
+    }
+    else
+    {   $ret .= "$reg1";   }
+
+    $ret .= "$post]";
+    $ret =~ s/\+\]/]/; # in case $addr was the only argument
+    $ret =~ s/\[\s*\]//;
+
+  $ret;
+}
+sub ::BP        { &get_mem("BYTE",@_);  }
+sub ::DWP       { &get_mem("DWORD",@_); }
+sub ::QWP       { &get_mem("QWORD",@_); }
+sub ::BC        { "@_";  }
+sub ::DWC       { "@_"; }
+
+sub ::file
+{ my $tmp=<<___;
+TITLE   $_[0].asm
+IF \@Version LT 800
+ECHO MASM version 8.00 or later is strongly recommended.
+ENDIF
+.486
+.MODEL  FLAT
+OPTION  DOTNAME
+IF \@Version LT 800
+.text\$ SEGMENT PAGE 'CODE'
+ELSE
+.text\$ SEGMENT ALIGN(64) 'CODE'
+ENDIF
+___
+    push(@out,$tmp);
+    $segment = ".text\$";
+}
+
+sub ::function_begin_B
+{ my $func=shift;
+  my $global=($func !~ /^_/);
+  my $begin="${::lbdecor}_${func}_begin";
+
+    &::LABEL($func,$global?"$begin":"$nmdecor$func");
+    $func="ALIGN\t16\n".$nmdecor.$func."\tPROC";
+
+    if ($global)    { $func.=" PUBLIC\n${begin}::\n"; }
+    else            { $func.=" PRIVATE\n";            }
+    push(@out,$func);
+    $::stack=4;
+}
+sub ::function_end_B
+{ my $func=shift;
+
+    push(@out,"$nmdecor$func ENDP\n");
+    $::stack=0;
+    &::wipe_labels();
+}
+
+sub ::file_end
+{ my $xmmheader=<<___;
+.686
+.XMM
+IF \@Version LT 800
+XMMWORD STRUCT 16
+DQ      2 dup (?)
+XMMWORD ENDS
+ENDIF
+___
+    if (grep {/\b[x]?mm[0-7]\b/i} @out) {
+        grep {s/\.[3-7]86/$xmmheader/} @out;
+    }
+
+    push(@out,"$segment ENDS\n");
+
+    if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out)
+    {   my $comm=<<___;
+.bss    SEGMENT 'BSS'
+COMM    ${nmdecor}OPENSSL_ia32cap_P:DWORD
+.bss    ENDS
+___
+        # comment out OPENSSL_ia32cap_P declarations
+        grep {s/(^EXTERN\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out;
+        push (@out,$comm);
+    }
+    push (@out,$initseg) if ($initseg);
+    push (@out,"END\n");
+}
+
+sub ::comment {   foreach (@_) { push(@out,"\t; $_\n"); }   }
+
+*::set_label_B = sub
+{ my $l=shift; push(@out,$l.($l=~/^\Q${::lbdecor}\E[0-9]{3}/?":\n":"::\n")); };
+
+sub ::external_label
+{   foreach(@_)
+    {   push(@out, "EXTERN\t".&::LABEL($_,$nmdecor.$_).":NEAR\n");   }
+}
+
+sub ::public_label
+{   push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");   }
+
+sub ::data_byte
+{   push(@out,("DB\t").join(',',@_)."\n");      }
+
+sub ::data_word
+{   push(@out,("DD\t").join(',',@_)."\n");      }
+
+sub ::align
+{   push(@out,"ALIGN\t$_[0]\n");        }
+
+sub ::picmeup
+{ my($dst,$sym)=@_;
+    &::lea($dst,&::DWP($sym));
+}
+
+sub ::initseg
+{ my $f=$nmdecor.shift;
+
+    $initseg.=<<___;
+.CRT\$XCU       SEGMENT DWORD PUBLIC 'DATA'
+EXTERN  $f:NEAR
+DD      $f
+.CRT\$XCU       ENDS
+___
+}
+
+sub ::dataseg
+{   push(@out,"$segment\tENDS\n_DATA\tSEGMENT\n"); $segment="_DATA";   }
+
+1;
diff --git a/src/lib/libcrypto/perlasm/x86ms.pl b/src/lib/libcrypto/perlasm/x86ms.pl
deleted file mode 100644
index a0be2934c2..0000000000
--- a/src/lib/libcrypto/perlasm/x86ms.pl
+++ /dev/null
@@ -1,472 +0,0 @@
-#!/usr/local/bin/perl
-
-package x86ms;
-
-$label="L000";
-
-%lb=(   'eax',  'al',
-        'ebx',  'bl',
-        'ecx',  'cl',
-        'edx',  'dl',
-        'ax',   'al',
-        'bx',   'bl',
-        'cx',   'cl',
-        'dx',   'dl',
-        );
-
-%hb=(   'eax',  'ah',
-        'ebx',  'bh',
-        'ecx',  'ch',
-        'edx',  'dh',
-        'ax',   'ah',
-        'bx',   'bh',
-        'cx',   'ch',
-        'dx',   'dh',
-        );
-
-sub main'asm_init_output { @out=(); }
-sub main'asm_get_output { return(@out); }
-sub main'get_labels { return(@labels); }
-sub main'external_label
-{
-        push(@labels,@_);
-        foreach (@_) {
-                push(@out, "EXTRN\t_$_:DWORD\n");
-        }
-}
-
-sub main'LB
-        {
-        (defined($lb{$_[0]})) || die "$_[0] does not have a 'low byte'\n";
-        return($lb{$_[0]});
-        }
-
-sub main'HB
-        {
-        (defined($hb{$_[0]})) || die "$_[0] does not have a 'high byte'\n";
-        return($hb{$_[0]});
-        }
-
-sub main'BP
-        {
-        &get_mem("BYTE",@_);
-        }
-
-sub main'DWP
-        {
-        &get_mem("DWORD",@_);
-        }
-
-sub main'QWP
-        {
-        &get_mem("QWORD",@_);
-        }
-
-sub main'BC
-        {
-        return @_;
-        }
-
-sub main'DWC
-        {
-        return @_;
-        }
-
-sub main'stack_push
-        {
-        local($num)=@_;
-        $stack+=$num*4;
-        &main'sub("esp",$num*4);
-        }
-
-sub main'stack_pop
-        {
-        local($num)=@_;
-        $stack-=$num*4;
-        &main'add("esp",$num*4);
-        }
-
-sub get_mem
-        {
-        local($size,$addr,$reg1,$reg2,$idx)=@_;
-        local($t,$post);
-        local($ret)="$size PTR ";
-
-        $addr =~ s/^\s+//;
-        if ($addr =~ /^(.+)\+(.+)$/)
-                {
-                $reg2=&conv($1);
-                $addr="_$2";
-                }
-        elsif ($addr =~ /^[_a-z][_a-z0-9]*$/i)
-                {
-                $addr="_$addr";
-                }
-
-        if ($addr =~ /^.+\-.+$/) { $addr="($addr)"; }
-
-        $reg1="$regs{$reg1}" if defined($regs{$reg1});
-        $reg2="$regs{$reg2}" if defined($regs{$reg2});
-        if (($addr ne "") && ($addr ne 0))
-                {
-                if ($addr !~ /^-/)
-                        { $ret.=$addr; }
-                else    { $post=$addr; }
-                }
-        if ($reg2 ne "")
-                {
-                $t="";
-                $t="*$idx" if ($idx != 0);
-                $reg1="+".$reg1 if ("$reg1$post" ne "");
-                $ret.="[$reg2$t$reg1$post]";
-                }
-        else
-                {
-                $ret.="[$reg1$post]"
-                }
-        $ret =~ s/\[\]//;       # in case $addr was the only argument
-        return($ret);
-        }
-
-sub main'mov    { &out2("mov",@_); }
-sub main'movb   { &out2("mov",@_); }
-sub main'and    { &out2("and",@_); }
-sub main'or     { &out2("or",@_); }
-sub main'shl    { &out2("shl",@_); }
-sub main'shr    { &out2("shr",@_); }
-sub main'xor    { &out2("xor",@_); }
-sub main'xorb   { &out2("xor",@_); }
-sub main'add    { &out2("add",@_); }
-sub main'adc    { &out2("adc",@_); }
-sub main'sub    { &out2("sub",@_); }
-sub main'sbb    { &out2("sbb",@_); }
-sub main'rotl   { &out2("rol",@_); }
-sub main'rotr   { &out2("ror",@_); }
-sub main'exch   { &out2("xchg",@_); }
-sub main'cmp    { &out2("cmp",@_); }
-sub main'lea    { &out2("lea",@_); }
-sub main'mul    { &out1("mul",@_); }
-sub main'imul   { &out2("imul",@_); }
-sub main'div    { &out1("div",@_); }
-sub main'dec    { &out1("dec",@_); }
-sub main'inc    { &out1("inc",@_); }
-sub main'jmp    { &out1("jmp",@_); }
-sub main'jmp_ptr { &out1p("jmp",@_); }
-sub main'je     { &out1("je",@_); }
-sub main'jle    { &out1("jle",@_); }
-sub main'jz     { &out1("jz",@_); }
-sub main'jge    { &out1("jge",@_); }
-sub main'jl     { &out1("jl",@_); }
-sub main'ja     { &out1("ja",@_); }
-sub main'jae    { &out1("jae",@_); }
-sub main'jb     { &out1("jb",@_); }
-sub main'jbe    { &out1("jbe",@_); }
-sub main'jc     { &out1("jc",@_); }
-sub main'jnc    { &out1("jnc",@_); }
-sub main'jnz    { &out1("jnz",@_); }
-sub main'jne    { &out1("jne",@_); }
-sub main'jno    { &out1("jno",@_); }
-sub main'push   { &out1("push",@_); $stack+=4; }
-sub main'pop    { &out1("pop",@_); $stack-=4; }
-sub main'pushf  { &out0("pushfd"); $stack+=4; }
-sub main'popf   { &out0("popfd"); $stack-=4; }
-sub main'bswap  { &out1("bswap",@_); &using486(); }
-sub main'not    { &out1("not",@_); }
-sub main'call   { &out1("call",($_[0]=~/^\$L/?'':'_').$_[0]); }
-sub main'call_ptr { &out1p("call",@_); }
-sub main'ret    { &out0("ret"); }
-sub main'nop    { &out0("nop"); }
-sub main'test   { &out2("test",@_); }
-sub main'bt     { &out2("bt",@_); }
-sub main'leave  { &out0("leave"); }
-sub main'cpuid  { &out0("DW\t0A20Fh"); }
-sub main'rdtsc  { &out0("DW\t0310Fh"); }
-sub main'halt   { &out0("hlt"); }
-sub main'movz   { &out2("movzx",@_); }
-sub main'neg    { &out1("neg",@_); }
-sub main'cld    { &out0("cld"); }
-
-# SSE2
-sub main'emms   { &out0("emms"); }
-sub main'movd   { &out2("movd",@_); }
-sub main'movq   { &out2("movq",@_); }
-sub main'movdqu { &out2("movdqu",@_); }
-sub main'movdqa { &out2("movdqa",@_); }
-sub main'movdq2q{ &out2("movdq2q",@_); }
-sub main'movq2dq{ &out2("movq2dq",@_); }
-sub main'paddq  { &out2("paddq",@_); }
-sub main'pmuludq{ &out2("pmuludq",@_); }
-sub main'psrlq  { &out2("psrlq",@_); }
-sub main'psllq  { &out2("psllq",@_); }
-sub main'pxor   { &out2("pxor",@_); }
-sub main'por    { &out2("por",@_); }
-sub main'pand   { &out2("pand",@_); }
-
-sub out2
-        {
-        local($name,$p1,$p2)=@_;
-        local($l,$t,$line);
-
-        $line="\t$name\t";
-        $t=&conv($p1).",";
-        $l=length($t);
-        $line.="$t";
-        $l=4-($l+9)/8;
-        $line.="\t" x $l;
-        $line.=&conv($p2);
-        if ($line=~/\bxmm[0-7]\b/i) { $line=~s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i; }
-        push(@out,$line."\n");
-        }
-
-sub out0
-        {
-        local($name)=@_;
-
-        push(@out,"\t$name\n");
-        }
-
-sub out1
-        {
-        local($name,$p1)=@_;
-        local($l,$t);
-
-        push(@out,"\t$name\t".&conv($p1)."\n");
-        }
-
-sub conv
-        {
-        local($p)=@_;
-
-        $p =~ s/0x([0-9A-Fa-f]+)/0$1h/;
-        return $p;
-        }
-
-sub using486
-        {
-        return if $using486;
-        $using486++;
-        grep(s/\.386/\.486/,@out);
-        }
-
-sub main'file
-        {
-        local($file)=@_;
-
-        local($tmp)=<<"EOF";
-        TITLE   $file.asm
-        .386
-.model  FLAT
-_TEXT\$ SEGMENT PAGE 'CODE'
-
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'function_begin
-        {
-        local($func,$extra)=@_;
-
-        push(@labels,$func);
-
-        local($tmp)=<<"EOF";
-PUBLIC  _$func
-$extra
-_$func PROC NEAR
-        push    ebp
-        push    ebx
-        push    esi
-        push    edi
-EOF
-        push(@out,$tmp);
-        $stack=20;
-        }
-
-sub main'function_begin_B
-        {
-        local($func,$extra)=@_;
-
-        local($tmp)=<<"EOF";
-PUBLIC  _$func
-$extra
-_$func PROC NEAR
-EOF
-        push(@out,$tmp);
-        $stack=4;
-        }
-
-sub main'function_end
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-        pop     edi
-        pop     esi
-        pop     ebx
-        pop     ebp
-        ret
-_$func ENDP
-EOF
-        push(@out,$tmp);
-        $stack=0;
-        %label=();
-        }
-
-sub main'function_end_B
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-_$func ENDP
-EOF
-        push(@out,$tmp);
-        $stack=0;
-        %label=();
-        }
-
-sub main'function_end_A
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-        pop     edi
-        pop     esi
-        pop     ebx
-        pop     ebp
-        ret
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'file_end
-        {
-        # try to detect if SSE2 or MMX extensions were used...
-        my $xmmheader=<<___;
-.686
-.XMM
-IF \@Version LT 800
-XMMWORD STRUCT 16
-        DQ  2 dup (?)
-XMMWORD ENDS
-ENDIF
-___
-        if (grep {/\b[x]?mm[0-7]\b/i} @out) {
-                grep {s/\.[3-7]86/$xmmheader/} @out;
-                }
-        push(@out,"_TEXT\$      ENDS\n");
-        push(@out,"END\n");
-        }
-
-sub main'wparam
-        {
-        local($num)=@_;
-
-        return(&main'DWP($stack+$num*4,"esp","",0));
-        }
-
-sub main'swtmp
-        {
-        return(&main'DWP($_[0]*4,"esp","",0));
-        }
-
-# Should use swtmp, which is above esp.  Linix can trash the stack above esp
-#sub main'wtmp
-#       {
-#       local($num)=@_;
-#
-#       return(&main'DWP(-(($num+1)*4),"esp","",0));
-#       }
-
-sub main'comment
-        {
-        foreach (@_)
-                {
-                push(@out,"\t; $_\n");
-                }
-        }
-
-sub main'public_label
-        {
-        $label{$_[0]}="_$_[0]"  if (!defined($label{$_[0]}));
-        push(@out,"PUBLIC\t$label{$_[0]}\n");
-        }
-
-sub main'label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}="\$${label}${_[0]}";
-                $label++;
-                }
-        return($label{$_[0]});
-        }
-
-sub main'set_label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}="\$${label}${_[0]}";
-                $label++;
-                }
-        if ($_[1]!=0 && $_[1]>1)
-                {
-                main'align($_[1]);
-                }
-        if((defined $_[2]) && ($_[2] == 1))
-                {
-                push(@out,"$label{$_[0]}::\n");
-                }
-        elsif ($label{$_[0]} !~ /^\$/)
-                {
-                push(@out,"$label{$_[0]}\tLABEL PTR\n");
-                }
-        else
-                {
-                push(@out,"$label{$_[0]}:\n");
-                }
-        }
-
-sub main'data_byte
-        {
-        push(@out,"\tDB\t".join(',',@_)."\n");
-        }
-
-sub main'data_word
-        {
-        push(@out,"\tDD\t".join(',',@_)."\n");
-        }
-
-sub main'align
-        {
-        push(@out,"\tALIGN\t$_[0]\n");
-        }
-
-sub out1p
-        {
-        local($name,$p1)=@_;
-        local($l,$t);
-
-        push(@out,"\t$name\t".&conv($p1)."\n");
-        }
-
-sub main'picmeup
-        {
-        local($dst,$sym)=@_;
-        &main'lea($dst,&main'DWP($sym));
-        }
-
-sub main'blindpop { &out1("pop",@_); }
-
-sub main'initseg 
-        {
-        local($f)=@_;
-        local($tmp)=<<___;
-OPTION  DOTNAME
-.CRT\$XCU       SEGMENT DWORD PUBLIC 'DATA'
-EXTRN   _$f:NEAR
-DD      _$f
-.CRT\$XCU       ENDS
-___
-        push(@out,$tmp);
-        }
-
-1;
diff --git a/src/lib/libcrypto/perlasm/x86unix.pl b/src/lib/libcrypto/perlasm/x86unix.pl
deleted file mode 100644
index a4c947165e..0000000000
--- a/src/lib/libcrypto/perlasm/x86unix.pl
+++ /dev/null
@@ -1,725 +0,0 @@
-#!/usr/local/bin/perl
-
-package x86unix;        # GAS actually...
-
-$label="L000";
-$const="";
-$constl=0;
-
-$align=($main'aout)?"4":"16";
-$under=($main'aout or $main'coff)?"_":"";
-$dot=($main'aout)?"":".";
-$com_start="#" if ($main'aout or $main'coff);
-
-sub main'asm_init_output { @out=(); }
-sub main'asm_get_output { return(@out); }
-sub main'get_labels { return(@labels); }
-sub main'external_label { push(@labels,@_); }
-
-if ($main'cpp)
-        {
-        $align="ALIGN";
-        $under="";
-        $com_start='/*';
-        $com_end='*/';
-        }
-
-%lb=(   'eax',  '%al',
-        'ebx',  '%bl',
-        'ecx',  '%cl',
-        'edx',  '%dl',
-        'ax',   '%al',
-        'bx',   '%bl',
-        'cx',   '%cl',
-        'dx',   '%dl',
-        );
-
-%hb=(   'eax',  '%ah',
-        'ebx',  '%bh',
-        'ecx',  '%ch',
-        'edx',  '%dh',
-        'ax',   '%ah',
-        'bx',   '%bh',
-        'cx',   '%ch',
-        'dx',   '%dh',
-        );
-
-%regs=( 'eax',  '%eax',
-        'ebx',  '%ebx',
-        'ecx',  '%ecx',
-        'edx',  '%edx',
-        'esi',  '%esi',
-        'edi',  '%edi',
-        'ebp',  '%ebp',
-        'esp',  '%esp',
-
-        'mm0',  '%mm0',
-        'mm1',  '%mm1',
-        'mm2',  '%mm2',
-        'mm3',  '%mm3',
-        'mm4',  '%mm4',
-        'mm5',  '%mm5',
-        'mm6',  '%mm6',
-        'mm7',  '%mm7',
-
-        'xmm0', '%xmm0',
-        'xmm1', '%xmm1',
-        'xmm2', '%xmm2',
-        'xmm3', '%xmm3',
-        'xmm4', '%xmm4',
-        'xmm5', '%xmm5',
-        'xmm6', '%xmm6',
-        'xmm7', '%xmm7',
-        );
-
-%reg_val=(
-        'eax',  0x00,
-        'ebx',  0x03,
-        'ecx',  0x01,
-        'edx',  0x02,
-        'esi',  0x06,
-        'edi',  0x07,
-        'ebp',  0x05,
-        'esp',  0x04,
-        );
-
-sub main'LB
-        {
-        (defined($lb{$_[0]})) || die "$_[0] does not have a 'low byte'\n";
-        return($lb{$_[0]});
-        }
-
-sub main'HB
-        {
-        (defined($hb{$_[0]})) || die "$_[0] does not have a 'high byte'\n";
-        return($hb{$_[0]});
-        }
-
-sub main'DWP
-        {
-        local($addr,$reg1,$reg2,$idx)=@_;
-
-        $ret="";
-        $addr =~ s/(^|[+ \t])([A-Za-z_]+[A-Za-z0-9_]+)($|[+ \t])/$1$under$2$3/;
-        $reg1="$regs{$reg1}" if defined($regs{$reg1});
-        $reg2="$regs{$reg2}" if defined($regs{$reg2});
-        $ret.=$addr if ($addr ne "") && ($addr ne 0);
-        if ($reg2 ne "")
-                {
-                if($idx ne "" && $idx != 0)
-                    { $ret.="($reg1,$reg2,$idx)"; }
-                else
-                    { $ret.="($reg1,$reg2)"; }
-                }
-        elsif ($reg1 ne "")
-                { $ret.="($reg1)" }
-        return($ret);
-        }
-
-sub main'QWP
-        {
-        return(&main'DWP(@_));
-        }
-
-sub main'BP
-        {
-        return(&main'DWP(@_));
-        }
-
-sub main'BC
-        {
-        return @_;
-        }
-
-sub main'DWC
-        {
-        return @_;
-        }
-
-#sub main'BP
-#       {
-#       local($addr,$reg1,$reg2,$idx)=@_;
-#
-#       $ret="";
-#
-#       $addr =~ s/(^|[+ \t])([A-Za-z_]+)($|[+ \t])/$1$under$2$3/;
-#       $reg1="$regs{$reg1}" if defined($regs{$reg1});
-#       $reg2="$regs{$reg2}" if defined($regs{$reg2});
-#       $ret.=$addr if ($addr ne "") && ($addr ne 0);
-#       if ($reg2 ne "")
-#               { $ret.="($reg1,$reg2,$idx)"; }
-#       else
-#               { $ret.="($reg1)" }
-#       return($ret);
-#       }
-
-sub main'mov    { &out2("movl",@_); }
-sub main'movb   { &out2("movb",@_); }
-sub main'and    { &out2("andl",@_); }
-sub main'or     { &out2("orl",@_); }
-sub main'shl    { &out2("sall",@_); }
-sub main'shr    { &out2("shrl",@_); }
-sub main'xor    { &out2("xorl",@_); }
-sub main'xorb   { &out2("xorb",@_); }
-sub main'add    { &out2($_[0]=~/%[a-d][lh]/?"addb":"addl",@_); }
-sub main'adc    { &out2("adcl",@_); }
-sub main'sub    { &out2("subl",@_); }
-sub main'sbb    { &out2("sbbl",@_); }
-sub main'rotl   { &out2("roll",@_); }
-sub main'rotr   { &out2("rorl",@_); }
-sub main'exch   { &out2($_[0]=~/%[a-d][lh]/?"xchgb":"xchgl",@_); }
-sub main'cmp    { &out2("cmpl",@_); }
-sub main'lea    { &out2("leal",@_); }
-sub main'mul    { &out1("mull",@_); }
-sub main'imul   { &out2("imull",@_); }
-sub main'div    { &out1("divl",@_); }
-sub main'jmp    { &out1("jmp",@_); }
-sub main'jmp_ptr { &out1p("jmp",@_); }
-sub main'je     { &out1("je",@_); }
-sub main'jle    { &out1("jle",@_); }
-sub main'jne    { &out1("jne",@_); }
-sub main'jnz    { &out1("jnz",@_); }
-sub main'jz     { &out1("jz",@_); }
-sub main'jge    { &out1("jge",@_); }
-sub main'jl     { &out1("jl",@_); }
-sub main'ja     { &out1("ja",@_); }
-sub main'jae    { &out1("jae",@_); }
-sub main'jb     { &out1("jb",@_); }
-sub main'jbe    { &out1("jbe",@_); }
-sub main'jc     { &out1("jc",@_); }
-sub main'jnc    { &out1("jnc",@_); }
-sub main'jno    { &out1("jno",@_); }
-sub main'dec    { &out1("decl",@_); }
-sub main'inc    { &out1($_[0]=~/%[a-d][hl]/?"incb":"incl",@_); }
-sub main'push   { &out1("pushl",@_); $stack+=4; }
-sub main'pop    { &out1("popl",@_); $stack-=4; }
-sub main'pushf  { &out0("pushfl"); $stack+=4; }
-sub main'popf   { &out0("popfl"); $stack-=4; }
-sub main'not    { &out1("notl",@_); }
-sub main'call   {       my $pre=$under;
-                        foreach $i (%label)
-                        { if ($label{$i} eq $_[0]) { $pre=''; last; } }
-                        &out1("call",$pre.$_[0]);
-                }
-sub main'call_ptr { &out1p("call",@_); }
-sub main'ret    { &out0("ret"); }
-sub main'nop    { &out0("nop"); }
-sub main'test   { &out2("testl",@_); }
-sub main'bt     { &out2("btl",@_); }
-sub main'leave  { &out0("leave"); }
-sub main'cpuid  { &out0(".byte\t0x0f,0xa2"); }
-sub main'rdtsc  { &out0(".byte\t0x0f,0x31"); }
-sub main'halt   { &out0("hlt"); }
-sub main'movz   { &out2("movzbl",@_); }
-sub main'neg    { &out1("negl",@_); }
-sub main'cld    { &out0("cld"); }
-
-# SSE2
-sub main'emms   { &out0("emms"); }
-sub main'movd   { &out2("movd",@_); }
-sub main'movdqu { &out2("movdqu",@_); }
-sub main'movdqa { &out2("movdqa",@_); }
-sub main'movdq2q{ &out2("movdq2q",@_); }
-sub main'movq2dq{ &out2("movq2dq",@_); }
-sub main'paddq  { &out2("paddq",@_); }
-sub main'pmuludq{ &out2("pmuludq",@_); }
-sub main'psrlq  { &out2("psrlq",@_); }
-sub main'psllq  { &out2("psllq",@_); }
-sub main'pxor   { &out2("pxor",@_); }
-sub main'por    { &out2("por",@_); }
-sub main'pand   { &out2("pand",@_); }
-sub main'movq   {
-        local($p1,$p2,$optimize)=@_;
-        if ($optimize && $p1=~/^mm[0-7]$/ && $p2=~/^mm[0-7]$/)
-                # movq between mmx registers can sink Intel CPUs
-                {       push(@out,"\tpshufw\t\$0xe4,%$p2,%$p1\n");      }
-        else    {       &out2("movq",@_);                               }
-        }
-
-# The bswapl instruction is new for the 486. Emulate if i386.
-sub main'bswap
-        {
-        if ($main'i386)
-                {
-                &main'comment("bswapl @_");
-                &main'exch(main'HB(@_),main'LB(@_));
-                &main'rotr(@_,16);
-                &main'exch(main'HB(@_),main'LB(@_));
-                }
-        else
-                {
-                &out1("bswapl",@_);
-                }
-        }
-
-sub out2
-        {
-        local($name,$p1,$p2)=@_;
-        local($l,$ll,$t);
-        local(%special)=(       "roll",0xD1C0,"rorl",0xD1C8,
-                                "rcll",0xD1D0,"rcrl",0xD1D8,
-                                "shll",0xD1E0,"shrl",0xD1E8,
-                                "sarl",0xD1F8);
-        
-        if ((defined($special{$name})) && defined($regs{$p1}) && ($p2 == 1))
-                {
-                $op=$special{$name}|$reg_val{$p1};
-                $tmp1=sprintf(".byte %d\n",($op>>8)&0xff);
-                $tmp2=sprintf(".byte %d\t",$op     &0xff);
-                push(@out,$tmp1);
-                push(@out,$tmp2);
-
-                $p2=&conv($p2);
-                $p1=&conv($p1);
-                &main'comment("$name $p2 $p1");
-                return;
-                }
-
-        push(@out,"\t$name\t");
-        $t=&conv($p2).",";
-        $l=length($t);
-        push(@out,$t);
-        $ll=4-($l+9)/8;
-        $tmp1=sprintf("\t" x $ll);
-        push(@out,$tmp1);
-        push(@out,&conv($p1)."\n");
-        }
-
-sub out1
-        {
-        local($name,$p1)=@_;
-        local($l,$t);
-        local(%special)=("bswapl",0x0FC8);
-
-        if ((defined($special{$name})) && defined($regs{$p1}))
-                {
-                $op=$special{$name}|$reg_val{$p1};
-                $tmp1=sprintf(".byte %d\n",($op>>8)&0xff);
-                $tmp2=sprintf(".byte %d\t",$op     &0xff);
-                push(@out,$tmp1);
-                push(@out,$tmp2);
-
-                $p2=&conv($p2);
-                $p1=&conv($p1);
-                &main'comment("$name $p2 $p1");
-                return;
-                }
-
-        push(@out,"\t$name\t".&conv($p1)."\n");
-        }
-
-sub out1p
-        {
-        local($name,$p1)=@_;
-        local($l,$t);
-
-        push(@out,"\t$name\t*".&conv($p1)."\n");
-        }
-
-sub out0
-        {
-        push(@out,"\t$_[0]\n");
-        }
-
-sub conv
-        {
-        local($p)=@_;
-
-#       $p =~ s/0x([0-9A-Fa-f]+)/0$1h/;
-
-        $p=$regs{$p} if (defined($regs{$p}));
-
-        $p =~ s/^(-{0,1}[0-9A-Fa-f]+)$/\$$1/;
-        $p =~ s/^(0x[0-9A-Fa-f]+)$/\$$1/;
-        return $p;
-        }
-
-sub main'file
-        {
-        local($file)=@_;
-
-        local($tmp)=<<"EOF";
-        .file   "$file.s"
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'function_begin
-        {
-        local($func)=@_;
-
-        &main'external_label($func);
-        $func=$under.$func;
-
-        local($tmp)=<<"EOF";
-.text
-.globl  $func
-EOF
-        push(@out,$tmp);
-        if ($main'cpp)
-                { $tmp=push(@out,"TYPE($func,\@function)\n"); }
-        elsif ($main'coff)
-                { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
-        elsif ($main'aout and !$main'pic)
-                { }
-        else    { $tmp=push(@out,".type\t$func,\@function\n"); }
-        push(@out,".align\t$align\n");
-        push(@out,"$func:\n");
-        $tmp=<<"EOF";
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-
-EOF
-        push(@out,$tmp);
-        $stack=20;
-        }
-
-sub main'function_begin_B
-        {
-        local($func,$extra)=@_;
-
-        &main'external_label($func);
-        $func=$under.$func;
-
-        local($tmp)=<<"EOF";
-.text
-.globl  $func
-EOF
-        push(@out,$tmp);
-        if ($main'cpp)
-                { push(@out,"TYPE($func,\@function)\n"); }
-        elsif ($main'coff)
-                { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
-        elsif ($main'aout and !$main'pic)
-                { }
-        else    { push(@out,".type      $func,\@function\n"); }
-        push(@out,".align\t$align\n");
-        push(@out,"$func:\n");
-        $stack=4;
-        }
-
-sub main'function_end
-        {
-        local($func)=@_;
-
-        $func=$under.$func;
-
-        local($tmp)=<<"EOF";
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-${dot}L_${func}_end:
-EOF
-        push(@out,$tmp);
-
-        if ($main'cpp)
-                { push(@out,"SIZE($func,${dot}L_${func}_end-$func)\n"); }
-        elsif ($main'coff or $main'aout)
-                { }
-        else    { push(@out,".size\t$func,${dot}L_${func}_end-$func\n"); }
-        push(@out,".ident       \"$func\"\n");
-        $stack=0;
-        %label=();
-        }
-
-sub main'function_end_A
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'function_end_B
-        {
-        local($func)=@_;
-
-        $func=$under.$func;
-
-        push(@out,"${dot}L_${func}_end:\n");
-        if ($main'cpp)
-                { push(@out,"SIZE($func,${dot}L_${func}_end-$func)\n"); }
-        elsif ($main'coff or $main'aout)
-                { }
-        else    { push(@out,".size\t$func,${dot}L_${func}_end-$func\n"); }
-        push(@out,".ident       \"$func\"\n");
-        $stack=0;
-        %label=();
-        }
-
-sub main'wparam
-        {
-        local($num)=@_;
-
-        return(&main'DWP($stack+$num*4,"esp","",0));
-        }
-
-sub main'stack_push
-        {
-        local($num)=@_;
-        $stack+=$num*4;
-        &main'sub("esp",$num*4);
-        }
-
-sub main'stack_pop
-        {
-        local($num)=@_;
-        $stack-=$num*4;
-        &main'add("esp",$num*4);
-        }
-
-sub main'swtmp
-        {
-        return(&main'DWP($_[0]*4,"esp","",0));
-        }
-
-# Should use swtmp, which is above esp.  Linix can trash the stack above esp
-#sub main'wtmp
-#       {
-#       local($num)=@_;
-#
-#       return(&main'DWP(-($num+1)*4,"esp","",0));
-#       }
-
-sub main'comment
-        {
-        if (!defined($com_start) or $main'elf)
-                {       # Regarding $main'elf above...
-                        # GNU and SVR4 as'es use different comment delimiters,
-                push(@out,"\n");        # so we just skip ELF comments...
-                return;
-                }
-        foreach (@_)
-                {
-                if (/^\s*$/)
-                        { push(@out,"\n"); }
-                else
-                        { push(@out,"\t$com_start $_ $com_end\n"); }
-                }
-        }
-
-sub main'public_label
-        {
-        $label{$_[0]}="${under}${_[0]}" if (!defined($label{$_[0]}));
-        push(@out,".globl\t$label{$_[0]}\n");
-        }
-
-sub main'label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}="${dot}${label}${_[0]}";
-                $label++;
-                }
-        return($label{$_[0]});
-        }
-
-sub main'set_label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}="${dot}${label}${_[0]}";
-                $label++;
-                }
-        if ($_[1]!=0)
-                {
-                if ($_[1]>1)    { main'align($_[1]);            }
-                else            { push(@out,".align $align\n"); }
-                }
-        push(@out,"$label{$_[0]}:\n");
-        }
-
-sub main'file_end
-        {
-        # try to detect if SSE2 or MMX extensions were used on ELF platform...
-        if ($main'elf && grep {/\b%[x]*mm[0-7]\b|OPENSSL_ia32cap_P\b/i} @out) {
-                local($tmp);
-
-                push (@out,"\n.section\t.bss\n");
-                push (@out,".comm\t${under}OPENSSL_ia32cap_P,4,4\n");
-
-                return;
-        }
-
-        if ($const ne "")
-                {
-                push(@out,".section .rodata\n");
-                push(@out,$const);
-                $const="";
-                }
-        }
-
-sub main'data_byte
-        {
-        push(@out,"\t.byte\t".join(',',@_)."\n");
-        }
-
-sub main'data_word
-        {
-        push(@out,"\t.long\t".join(',',@_)."\n");
-        }
-
-sub main'align
-        {
-        my $val=$_[0],$p2,$i;
-        if ($main'aout) {
-                for ($p2=0;$val!=0;$val>>=1) { $p2++; }
-                $val=$p2-1;
-                $val.=",0x90";
-        }
-        push(@out,".align\t$val\n");
-        }
-
-# debug output functions: puts, putx, printf
-
-sub main'puts
-        {
-        &pushvars();
-        &main'push('$Lstring' . ++$constl);
-        &main'call('puts');
-        $stack-=4;
-        &main'add("esp",4);
-        &popvars();
-
-        $const .= "Lstring$constl:\n\t.string \"@_[0]\"\n";
-        }
-
-sub main'putx
-        {
-        &pushvars();
-        &main'push($_[0]);
-        &main'push('$Lstring' . ++$constl);
-        &main'call('printf');
-        &main'add("esp",8);
-        $stack-=8;
-        &popvars();
-
-        $const .= "Lstring$constl:\n\t.string \"\%X\"\n";
-        }
-
-sub main'printf
-        {
-        $ostack = $stack;
-        &pushvars();
-        for ($i = @_ - 1; $i >= 0; $i--)
-                {
-                if ($i == 0) # change this to support %s format strings
-                        {
-                        &main'push('$Lstring' . ++$constl);
-                        $const .= "Lstring$constl:\n\t.string \"@_[$i]\"\n";
-                        }
-                else
-                        {
-                        if ($_[$i] =~ /([0-9]*)\(%esp\)/)
-                                {
-                                &main'push(($1 + $stack - $ostack) . '(%esp)');
-                                }
-                        else
-                                {
-                                &main'push($_[$i]);
-                                }
-                        }
-                }
-        &main'call('printf');
-        $stack-=4*@_;
-        &main'add("esp",4*@_);
-        &popvars();
-        }
-
-sub pushvars
-        {
-        &main'pushf();
-        &main'push("edx");
-        &main'push("ecx");
-        &main'push("eax");
-        }
-
-sub popvars
-        {
-        &main'pop("eax");
-        &main'pop("ecx");
-        &main'pop("edx");
-        &main'popf();
-        }
-
-sub main'picmeup
-        {
-        local($dst,$sym)=@_;
-        if ($main'cpp)
-                {
-                local($tmp)=<<___;
-#if (defined(ELF) || defined(SOL)) && defined(PIC)
-        call    1f
-1:      popl    $regs{$dst}
-        addl    \$_GLOBAL_OFFSET_TABLE_+[.-1b],$regs{$dst}
-        movl    $sym\@GOT($regs{$dst}),$regs{$dst}
-#else
-        leal    $sym,$regs{$dst}
-#endif
-___
-                push(@out,$tmp);
-                }
-        elsif ($main'pic && ($main'elf || $main'aout))
-                {
-                &main'call(&main'label("PIC_me_up"));
-                &main'set_label("PIC_me_up");
-                &main'blindpop($dst);
-                &main'add($dst,"\$${under}_GLOBAL_OFFSET_TABLE_+[.-".
-                                &main'label("PIC_me_up") . "]");
-                &main'mov($dst,&main'DWP($under.$sym."\@GOT",$dst));
-                }
-        else
-                {
-                &main'lea($dst,&main'DWP($sym));
-                }
-        }
-
-sub main'blindpop { &out1("popl",@_); }
-
-sub main'initseg
-        {
-        local($f)=@_;
-        local($tmp);
-        if ($main'elf)
-                {
-                $tmp=<<___;
-.section        .init
-        call    $under$f
-        jmp     .Linitalign
-.align  $align
-.Linitalign:
-___
-                }
-        elsif ($main'coff)
-                {
-                $tmp=<<___;     # applies to both Cygwin and Mingw
-.section        .ctors
-.long   $under$f
-___
-                }
-        elsif ($main'aout)
-                {
-                local($ctor)="${under}_GLOBAL_\$I\$$f";
-                $tmp=".text\n";
-                $tmp.=".type    $ctor,\@function\n" if ($main'pic);
-                $tmp.=<<___;    # OpenBSD way...
-.globl  $ctor
-.align  2
-$ctor:
-        jmp     $under$f
-___
-                }
-        push(@out,$tmp) if ($tmp);
-        }
-
-1;
diff --git a/src/lib/libcrypto/pqueue/Makefile b/src/lib/libcrypto/pqueue/Makefile
new file mode 100644
index 0000000000..fb36a0c876
--- /dev/null
+++ b/src/lib/libcrypto/pqueue/Makefile
@@ -0,0 +1,83 @@
+#
+# OpenSSL/crypto/pqueue/Makefile
+#
+
+DIR=    pqueue
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=pqueue.c
+LIBOBJ=pqueue.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= pqueue.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+pqueue.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
+pqueue.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+pqueue.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+pqueue.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+pqueue.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pqueue.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+pqueue.o: ../../include/openssl/symhacks.h ../cryptlib.h pqueue.c pqueue.h
diff --git a/src/lib/libcrypto/pqueue/pq_compat.h b/src/lib/libcrypto/pqueue/pq_compat.h
deleted file mode 100644
index 7b2c32725c..0000000000
--- a/src/lib/libcrypto/pqueue/pq_compat.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* crypto/pqueue/pqueue_compat.h */
-/* 
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PQ_COMPAT_H
-#define HEADER_PQ_COMPAT_H
-
-#include <openssl/opensslconf.h>
-#include <openssl/bn.h>
-
-/* 
- * The purpose of this header file is for supporting 64-bit integer
- * manipulation on 32-bit (and lower) machines.  Currently the only
- * such environment is VMS, Utrix and those with smaller default integer
- * sizes than 32 bits.  For all such environment, we fall back to using
- * BIGNUM.  We may need to fine tune the conditions for systems that
- * are incorrectly configured.
- *
- * The only clients of this code are (1) pqueue for priority, and
- * (2) DTLS, for sequence number manipulation.
- */
-
-#if (defined(THIRTY_TWO_BIT) && !defined(BN_LLONG)) || defined(SIXTEEN_BIT) || defined(EIGHT_BIT)
-
-#define PQ_64BIT_IS_INTEGER 0
-#define PQ_64BIT_IS_BIGNUM 1
-
-#define PQ_64BIT     BIGNUM
-#define PQ_64BIT_CTX BN_CTX
-
-#define pq_64bit_init(x)           BN_init(x)
-#define pq_64bit_free(x)           BN_free(x)
-
-#define pq_64bit_ctx_new(ctx)      BN_CTX_new()
-#define pq_64bit_ctx_free(x)       BN_CTX_free(x)
-
-#define pq_64bit_assign(x, y)      BN_copy(x, y)
-#define pq_64bit_assign_word(x, y) BN_set_word(x, y)
-#define pq_64bit_gt(x, y)          BN_ucmp(x, y) >= 1 ? 1 : 0
-#define pq_64bit_eq(x, y)          BN_ucmp(x, y) == 0 ? 1 : 0
-#define pq_64bit_add_word(x, w)    BN_add_word(x, w)
-#define pq_64bit_sub(r, x, y)      BN_sub(r, x, y)
-#define pq_64bit_sub_word(x, w)    BN_sub_word(x, w)
-#define pq_64bit_mod(r, x, n, ctx) BN_mod(r, x, n, ctx)
-
-#define pq_64bit_bin2num(bn, bytes, len)   BN_bin2bn(bytes, len, bn)
-#define pq_64bit_num2bin(bn, bytes)        BN_bn2bin(bn, bytes)
-#define pq_64bit_get_word(x)               BN_get_word(x)
-#define pq_64bit_is_bit_set(x, offset)     BN_is_bit_set(x, offset)
-#define pq_64bit_lshift(r, x, shift)       BN_lshift(r, x, shift)
-#define pq_64bit_set_bit(x, num)           BN_set_bit(x, num)
-#define pq_64bit_get_length(x)             BN_num_bits((x))
-
-#else
-
-#define PQ_64BIT_IS_INTEGER 1
-#define PQ_64BIT_IS_BIGNUM 0
-
-#if defined(SIXTY_FOUR_BIT)
-#define PQ_64BIT BN_ULONG
-#define PQ_64BIT_PRINT "%lld"
-#elif defined(SIXTY_FOUR_BIT_LONG)
-#define PQ_64BIT BN_ULONG
-#define PQ_64BIT_PRINT "%ld"
-#elif defined(THIRTY_TWO_BIT)
-#define PQ_64BIT BN_ULLONG
-#define PQ_64BIT_PRINT "%lld"
-#endif
-
-#define PQ_64BIT_CTX      void
-
-#define pq_64bit_init(x)
-#define pq_64bit_free(x)
-#define pq_64bit_ctx_new(ctx)        (ctx)
-#define pq_64bit_ctx_free(x)
-
-#define pq_64bit_assign(x, y)        (*(x) = *(y))
-#define pq_64bit_assign_word(x, y)   (*(x) = y)
-#define pq_64bit_gt(x, y)                (*(x) > *(y))
-#define pq_64bit_eq(x, y)            (*(x) == *(y))
-#define pq_64bit_add_word(x, w)      (*(x) = (*(x) + (w)))
-#define pq_64bit_sub(r, x, y)        (*(r) = (*(x) - *(y)))
-#define pq_64bit_sub_word(x, w)      (*(x) = (*(x) - (w)))
-#define pq_64bit_mod(r, x, n, ctx)
-
-#define pq_64bit_bin2num(num, bytes, len) bytes_to_long_long(bytes, num)
-#define pq_64bit_num2bin(num, bytes)      long_long_to_bytes(num, bytes)
-#define pq_64bit_get_word(x)              *(x)
-#define pq_64bit_lshift(r, x, shift)      (*(r) = (*(x) << (shift)))
-#define pq_64bit_set_bit(x, num)          do { \
-                                              PQ_64BIT mask = 1; \
-                                              mask = mask << (num); \
-                                              *(x) |= mask; \
-                                          } while(0)
-#endif /* OPENSSL_SYS_VMS */
-
-#endif
diff --git a/src/lib/libcrypto/pqueue/pq_test.c b/src/lib/libcrypto/pqueue/pq_test.c
new file mode 100644
index 0000000000..8d496dfc65
--- /dev/null
+++ b/src/lib/libcrypto/pqueue/pq_test.c
@@ -0,0 +1,95 @@
+/* crypto/pqueue/pq_test.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "pqueue.h"
+
+int
+main(void)
+        {
+        pitem *item;
+        pqueue pq;
+
+        pq = pqueue_new();
+
+        item = pitem_new(3, NULL);
+        pqueue_insert(pq, item);
+
+        item = pitem_new(1, NULL);
+        pqueue_insert(pq, item);
+
+        item = pitem_new(2, NULL);
+        pqueue_insert(pq, item);
+
+        item = pqueue_find(pq, 1);
+        fprintf(stderr, "found %ld\n", item->priority);
+
+        item = pqueue_find(pq, 2);
+        fprintf(stderr, "found %ld\n", item->priority);
+
+        item = pqueue_find(pq, 3);
+        fprintf(stderr, "found %ld\n", item ? item->priority: 0);
+
+        pqueue_print(pq);
+
+        for(item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq))
+                pitem_free(item);
+
+        pqueue_free(pq);
+        return 0;
+        }
diff --git a/src/lib/libcrypto/pqueue/pqueue.c b/src/lib/libcrypto/pqueue/pqueue.c
new file mode 100644
index 0000000000..99a6fb874d
--- /dev/null
+++ b/src/lib/libcrypto/pqueue/pqueue.c
@@ -0,0 +1,253 @@
+/* crypto/pqueue/pqueue.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include "pqueue.h"
+
+typedef struct _pqueue
+        {
+        pitem *items;
+        int count;
+        } pqueue_s;
+
+pitem *
+pitem_new(unsigned char *prio64be, void *data)
+        {
+        pitem *item = (pitem *) OPENSSL_malloc(sizeof(pitem));
+        if (item == NULL) return NULL;
+
+        memcpy(item->priority,prio64be,sizeof(item->priority));
+
+        item->data = data;
+        item->next = NULL;
+
+        return item;
+        }
+
+void
+pitem_free(pitem *item)
+        {
+        if (item == NULL) return;
+
+        OPENSSL_free(item);
+        }
+
+pqueue_s *
+pqueue_new()
+        {
+        pqueue_s *pq = (pqueue_s *) OPENSSL_malloc(sizeof(pqueue_s));
+        if (pq == NULL) return NULL;
+
+        memset(pq, 0x00, sizeof(pqueue_s));
+        return pq;
+        }
+
+void
+pqueue_free(pqueue_s *pq)
+        {
+        if (pq == NULL) return;
+
+        OPENSSL_free(pq);
+        }
+
+pitem *
+pqueue_insert(pqueue_s *pq, pitem *item)
+        {
+        pitem *curr, *next;
+
+        if (pq->items == NULL)
+                {
+                pq->items = item;
+                return item;
+                }
+
+        for(curr = NULL, next = pq->items; 
+                next != NULL;
+                curr = next, next = next->next)
+                {
+                /* we can compare 64-bit value in big-endian encoding
+                 * with memcmp:-) */
+                int cmp = memcmp(next->priority, item->priority,8);
+                if (cmp > 0)            /* next > item */
+                        {
+                        item->next = next;
+
+                        if (curr == NULL) 
+                                pq->items = item;
+                        else  
+                                curr->next = item;
+
+                        return item;
+                        }
+                
+                else if (cmp == 0)      /* duplicates not allowed */
+                        return NULL;
+                }
+
+        item->next = NULL;
+        curr->next = item;
+
+        return item;
+        }
+
+pitem *
+pqueue_peek(pqueue_s *pq)
+        {
+        return pq->items;
+        }
+
+pitem *
+pqueue_pop(pqueue_s *pq)
+        {
+        pitem *item = pq->items;
+
+        if (pq->items != NULL)
+                pq->items = pq->items->next;
+
+        return item;
+        }
+
+pitem *
+pqueue_find(pqueue_s *pq, unsigned char *prio64be)
+        {
+        pitem *next, *prev = NULL;
+        pitem *found = NULL;
+
+        if ( pq->items == NULL)
+                return NULL;
+
+        for ( next = pq->items; next->next != NULL; 
+                  prev = next, next = next->next)
+                {
+                if ( memcmp(next->priority, prio64be,8) == 0)
+                        {
+                        found = next;
+                        break;
+                        }
+                }
+        
+        /* check the one last node */
+        if ( memcmp(next->priority, prio64be,8) ==0)
+                found = next;
+
+        if ( ! found)
+                return NULL;
+
+#if 0 /* find works in peek mode */
+        if ( prev == NULL)
+                pq->items = next->next;
+        else
+                prev->next = next->next;
+#endif
+
+        return found;
+        }
+
+void
+pqueue_print(pqueue_s *pq)
+        {
+        pitem *item = pq->items;
+
+        while(item != NULL)
+                {
+                printf("item\t%02x%02x%02x%02x%02x%02x%02x%02x\n",
+                        item->priority[0],item->priority[1],
+                        item->priority[2],item->priority[3],
+                        item->priority[4],item->priority[5],
+                        item->priority[6],item->priority[7]);
+                item = item->next;
+                }
+        }
+
+pitem *
+pqueue_iterator(pqueue_s *pq)
+        {
+        return pqueue_peek(pq);
+        }
+
+pitem *
+pqueue_next(pitem **item)
+        {
+        pitem *ret;
+
+        if ( item == NULL || *item == NULL)
+                return NULL;
+
+
+        /* *item != NULL */
+        ret = *item;
+        *item = (*item)->next;
+
+        return ret;
+        }
+
+int
+pqueue_size(pqueue_s *pq)
+{
+        pitem *item = pq->items;
+        int count = 0;
+        
+        while(item != NULL)
+        {
+                count++;
+                item = item->next;
+        }
+        return count;
+}
diff --git a/src/lib/libcrypto/pqueue/pqueue.h b/src/lib/libcrypto/pqueue/pqueue.h
new file mode 100644
index 0000000000..87fc9037c8
--- /dev/null
+++ b/src/lib/libcrypto/pqueue/pqueue.h
@@ -0,0 +1,94 @@
+/* crypto/pqueue/pqueue.h */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_PQUEUE_H
+#define HEADER_PQUEUE_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef struct _pqueue *pqueue;
+
+typedef struct _pitem
+        {
+        unsigned char priority[8]; /* 64-bit value in big-endian encoding */
+        void *data;
+        struct _pitem *next;
+        } pitem;
+
+typedef struct _pitem *piterator;
+
+pitem *pitem_new(unsigned char *prio64be, void *data);
+void   pitem_free(pitem *item);
+
+pqueue pqueue_new(void);
+void   pqueue_free(pqueue pq);
+
+pitem *pqueue_insert(pqueue pq, pitem *item);
+pitem *pqueue_peek(pqueue pq);
+pitem *pqueue_pop(pqueue pq);
+pitem *pqueue_find(pqueue pq, unsigned char *prio64be);
+pitem *pqueue_iterator(pqueue pq);
+pitem *pqueue_next(piterator *iter);
+
+void   pqueue_print(pqueue pq);
+int    pqueue_size(pqueue pq);
+
+#endif /* ! HEADER_PQUEUE_H */
diff --git a/src/lib/libcrypto/rand/rand_eng.c b/src/lib/libcrypto/rand/rand_eng.c
deleted file mode 100644
index 1669cef43c..0000000000
--- a/src/lib/libcrypto/rand/rand_eng.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* crypto/rand/rand_lib.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <time.h>
-#include "cryptlib.h"
-#include "rand_lcl.h"
-#include <openssl/rand.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#include <openssl/fips_rand.h>
-#endif
-
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-
-#if defined(OPENSSL_FIPS) && !defined(OPENSSL_NO_ENGINE)
-
-/* non-NULL if default_RAND_meth is ENGINE-provided */
-static ENGINE *funct_ref =NULL;
-
-int eng_RAND_set_rand_method(const RAND_METHOD *meth, const RAND_METHOD **pmeth)
-        {
-        if(funct_ref)
-                {
-                ENGINE_finish(funct_ref);
-                funct_ref = NULL;
-                }
-        *pmeth = meth;
-        return 1;
-        }
-
-const RAND_METHOD *eng_RAND_get_rand_method(const RAND_METHOD **pmeth)
-        {
-        if (!*pmeth)
-                {
-                ENGINE *e = ENGINE_get_default_RAND();
-                if(e)
-                        {
-                        *pmeth = ENGINE_get_RAND(e);
-                        if(!*pmeth)
-                                {
-                                ENGINE_finish(e);
-                                e = NULL;
-                                }
-                        }
-                if(e)
-                        funct_ref = e;
-                else
-                        if(FIPS_mode())
-                                *pmeth=FIPS_rand_method();
-                        else
-                        *pmeth = RAND_SSLeay();
-                }
-
-        if(FIPS_mode()
-                && *pmeth != FIPS_rand_check())
-            {
-            RANDerr(RAND_F_ENG_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD);
-            return 0;
-            }
-
-        return *pmeth;
-        }
-
-int RAND_set_rand_engine(ENGINE *engine)
-        {
-        const RAND_METHOD *tmp_meth = NULL;
-        if(engine)
-                {
-                if(!ENGINE_init(engine))
-                        return 0;
-                tmp_meth = ENGINE_get_RAND(engine);
-                if(!tmp_meth)
-                        {
-                        ENGINE_finish(engine);
-                        return 0;
-                        }
-                }
-        /* This function releases any prior ENGINE so call it first */
-        RAND_set_rand_method(tmp_meth);
-        funct_ref = engine;
-        return 1;
-        }
-
-void int_RAND_init_engine_callbacks(void)
-        {
-        static int done = 0;
-        if (done)
-                return;
-        int_RAND_set_callbacks(eng_RAND_set_rand_method,
-                                 eng_RAND_get_rand_method);
-        done = 1;
-        }
-
-#endif
diff --git a/src/lib/libssl/src/crypto/evp/dig_eng.c b/src/lib/libcrypto/rand/rand_nw.c
index 64cdf9366c..f177ffbe82 100644
--- a/src/lib/libssl/src/crypto/evp/dig_eng.c
+++ b/src/lib/libcrypto/rand/rand_nw.c
@@ -1,4 +1,4 @@
-/* crypto/evp/digest.c */
+/* crypto/rand/rand_nw.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -109,72 +109,75 @@
  *
  */
 
-#include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+#include <openssl/rand.h>
+#include "rand_lcl.h"
+
+#if defined (OPENSSL_SYS_NETWARE)
+
+#if defined(NETWARE_LIBC)
+#include <nks/thread.h>
+#else
+#include <nwthread.h>
 #endif
-#include "evp_locl.h"
 
-#ifndef OPENSSL_NO_ENGINE
+extern int GetProcessSwitchCount(void);
+#if !defined(NETWARE_LIBC) || (CURRENT_NDK_THRESHOLD < 509220000)
+extern void *RunningProcess; /* declare here same as found in newer NDKs */
+extern unsigned long GetSuperHighResolutionTimer(void);
+#endif
 
-#ifdef OPENSSL_FIPS
+   /* the FAQ indicates we need to provide at least 20 bytes (160 bits) of seed
+   */
+int RAND_poll(void)
+{
+   unsigned long l;
+   unsigned long tsc;
+   int i; 
 
-static int do_evp_md_engine_full(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE *impl)
-        {
-        if (*ptype)
-                {
-                /* Ensure an ENGINE left lying around from last time is cleared
-                 * (the previous check attempted to avoid this if the same
-                 * ENGINE and EVP_MD could be used). */
-                if(ctx->engine)
-                        ENGINE_finish(ctx->engine);
-                if(impl)
-                        {
-                        if (!ENGINE_init(impl))
-                                {
-                                EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION_ERROR);
-                                return 0;
-                                }
-                        }
-                else
-                        /* Ask if an ENGINE is reserved for this job */
-                        impl = ENGINE_get_digest_engine((*ptype)->type);
-                if(impl)
-                        {
-                        /* There's an ENGINE for this job ... (apparently) */
-                        const EVP_MD *d = ENGINE_get_digest(impl, (*ptype)->type);
-                        if(!d)
-                                {
-                                /* Same comment from evp_enc.c */
-                                EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION_ERROR);
-                                return 0;
-                                }
-                        /* We'll use the ENGINE's private digest definition */
-                        *ptype = d;
-                        /* Store the ENGINE functional reference so we know
-                         * 'type' came from an ENGINE and we need to release
-                         * it when done. */
-                        ctx->engine = impl;
-                        }
-                else
-                        ctx->engine = NULL;
-                }
-        else
-        if(!ctx->digest)
-                {
-                EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_NO_DIGEST_SET);
-                return 0;
-                }
-        return 1;
-        }
+      /* There are several options to gather miscellaneous data
+       * but for now we will loop checking the time stamp counter (rdtsc) and
+       * the SuperHighResolutionTimer.  Each iteration will collect 8 bytes
+       * of data but it is treated as only 1 byte of entropy.  The call to
+       * ThreadSwitchWithDelay() will introduce additional variability into
+       * the data returned by rdtsc.
+       *
+       * Applications can agument the seed material by adding additional
+       * stuff with RAND_add() and should probably do so.
+      */
+   l = GetProcessSwitchCount();
+   RAND_add(&l,sizeof(l),1);
+   
+   /* need to cast the void* to unsigned long here */
+   l = (unsigned long)RunningProcess;
+   RAND_add(&l,sizeof(l),1);
 
-void int_EVP_MD_init_engine_callbacks(void)
-        {
-        int_EVP_MD_set_engine_callbacks(
-                ENGINE_init, ENGINE_finish, do_evp_md_engine_full);
-        }
-#endif
+   for( i=2; i<ENTROPY_NEEDED; i++)
+   {
+#ifdef __MWERKS__
+      asm 
+      {
+         rdtsc
+         mov tsc, eax        
+      }
+#else
+      asm volatile("rdtsc":"=A" (tsc));
 #endif
+
+      RAND_add(&tsc, sizeof(tsc), 1);
+
+      l = GetSuperHighResolutionTimer();
+      RAND_add(&l, sizeof(l), 0);
+
+# if defined(NETWARE_LIBC)
+      NXThreadYield();
+# else /* NETWARE_CLIB */
+      ThreadSwitchWithDelay();
+# endif
+   }
+
+   return 1;
+}
+
+#endif 
+
diff --git a/src/lib/libcrypto/rc4/asm/rc4-ia64.S b/src/lib/libcrypto/rc4/asm/rc4-ia64.S
deleted file mode 100644
index 8210c47d04..0000000000
--- a/src/lib/libcrypto/rc4/asm/rc4-ia64.S
+++ /dev/null
@@ -1,159 +0,0 @@
-// ====================================================================
-// Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
-// project.
-//
-// Rights for redistribution and usage in source and binary forms are
-// granted according to the OpenSSL license. Warranty of any kind is
-// disclaimed.
-// ====================================================================
-
-.ident  "rc4-ia64.S, Version 2.0"
-.ident  "IA-64 ISA artwork by Andy Polyakov <appro@fy.chalmers.se>"
-
-// What's wrong with compiler generated code? Because of the nature of
-// C language, compiler doesn't [dare to] reorder load and stores. But
-// being memory-bound, RC4 should benefit from reorder [on in-order-
-// execution core such as IA-64]. But what can we reorder? At the very
-// least we can safely reorder references to key schedule in respect
-// to input and output streams. Secondly, from the first [close] glance
-// it appeared that it's possible to pull up some references to
-// elements of the key schedule itself. Original rationale ["prior
-// loads are not safe only for "degenerated" key schedule, when some
-// elements equal to the same value"] was kind of sloppy. I should have
-// formulated as it really was: if we assume that pulling up reference
-// to key[x+1] is not safe, then it would mean that key schedule would
-// "degenerate," which is never the case. The problem is that this
-// holds true in respect to references to key[x], but not to key[y].
-// Legitimate "collisions" do occur within every 256^2 bytes window.
-// Fortunately there're enough free instruction slots to keep prior
-// reference to key[x+1], detect "collision" and compensate for it.
-// All this without sacrificing a single clock cycle:-) Throughput is
-// ~210MBps on 900MHz CPU, which is is >3x faster than gcc generated
-// code and +30% - if compared to HP-UX C. Unrolling loop below should
-// give >30% on top of that...
-
-.text
-.explicit
-
-#if defined(_HPUX_SOURCE) && !defined(_LP64)
-# define ADDP   addp4
-#else
-# define ADDP   add
-#endif
-
-#ifndef SZ
-#define SZ      4       // this is set to sizeof(RC4_INT)
-#endif
-// SZ==4 seems to be optimal. At least SZ==8 is not any faster, not for
-// assembler implementation, while SZ==1 code is ~30% slower.
-#if SZ==1       // RC4_INT is unsigned char
-# define        LDKEY   ld1
-# define        STKEY   st1
-# define        OFF     0
-#elif SZ==4     // RC4_INT is unsigned int
-# define        LDKEY   ld4
-# define        STKEY   st4
-# define        OFF     2
-#elif SZ==8     // RC4_INT is unsigned long
-# define        LDKEY   ld8
-# define        STKEY   st8
-# define        OFF     3
-#endif
-
-out=r8;         // [expanded] output pointer
-inp=r9;         // [expanded] output pointer
-prsave=r10;
-key=r28;        // [expanded] pointer to RC4_KEY
-ksch=r29;       // (key->data+255)[&~(sizeof(key->data)-1)]
-xx=r30;
-yy=r31;
-
-// void RC4(RC4_KEY *key,size_t len,const void *inp,void *out);
-.global RC4#
-.proc   RC4#
-.align  32
-.skip   16
-RC4:
-        .prologue
-        .save   ar.pfs,r2
-{ .mii; alloc   r2=ar.pfs,4,12,0,16
-        .save   pr,prsave
-        mov     prsave=pr
-        ADDP    key=0,in0               };;
-{ .mib; cmp.eq  p6,p0=0,in1                     // len==0?
-        .save   ar.lc,r3
-        mov     r3=ar.lc
-(p6)    br.ret.spnt.many        b0      };;     // emergency exit
-
-        .body
-        .rotr   dat[4],key_x[4],tx[2],rnd[2],key_y[2],ty[1];
-
-{ .mib; LDKEY   xx=[key],SZ                     // load key->x
-        add     in1=-1,in1                      // adjust len for loop counter
-        nop.b   0                       }
-{ .mib; ADDP    inp=0,in2
-        ADDP    out=0,in3
-        brp.loop.imp    .Ltop,.Lexit-16 };;
-{ .mmi; LDKEY   yy=[key]                        // load key->y
-        add     ksch=SZ,key
-        mov     ar.lc=in1               }
-{ .mmi; mov     key_y[1]=r0                     // guarantee inequality
-                                                // in first iteration
-        add     xx=1,xx
-        mov     pr.rot=1<<16            };;
-{ .mii; nop.m   0
-        dep     key_x[1]=xx,r0,OFF,8
-        mov     ar.ec=3                 };;     // note that epilogue counter
-                                                // is off by 1. I compensate
-                                                // for this at exit...
-.Ltop:
-// The loop is scheduled for 4*(n+2) spin-rate on Itanium 2, which
-// theoretically gives asymptotic performance of clock frequency
-// divided by 4 bytes per seconds, or 400MBps on 1.6GHz CPU. This is
-// for sizeof(RC4_INT)==4. For smaller RC4_INT STKEY inadvertently
-// splits the last bundle and you end up with 5*n spin-rate:-(
-// Originally the loop was scheduled for 3*n and relied on key
-// schedule to be aligned at 256*sizeof(RC4_INT) boundary. But
-// *(out++)=dat, which maps to st1, had same effect [inadvertent
-// bundle split] and holded the loop back. Rescheduling for 4*n
-// made it possible to eliminate dependence on specific alignment
-// and allow OpenSSH keep "abusing" our API. Reaching for 3*n would
-// require unrolling, sticking to variable shift instruction for
-// collecting output [to avoid starvation for integer shifter] and
-// copying of key schedule to controlled place in stack [so that
-// deposit instruction can serve as substitute for whole
-// key->data+((x&255)<<log2(sizeof(key->data[0])))]...
-{ .mmi; (p19)   st1     [out]=dat[3],1                  // *(out++)=dat
-        (p16)   add     xx=1,xx                         // x++
-        (p18)   dep     rnd[1]=rnd[1],r0,OFF,8  }       // ((tx+ty)&255)<<OFF
-{ .mmi; (p16)   add     key_x[1]=ksch,key_x[1]          // &key[xx&255]
-        (p17)   add     key_y[1]=ksch,key_y[1]  };;     // &key[yy&255] 
-{ .mmi; (p16)   LDKEY   tx[0]=[key_x[1]]                // tx=key[xx]
-        (p17)   LDKEY   ty[0]=[key_y[1]]                // ty=key[yy]   
-        (p16)   dep     key_x[0]=xx,r0,OFF,8    }       // (xx&255)<<OFF
-{ .mmi; (p18)   add     rnd[1]=ksch,rnd[1]              // &key[(tx+ty)&255]
-        (p16)   cmp.ne.unc p20,p21=key_x[1],key_y[1] };;
-{ .mmi; (p18)   LDKEY   rnd[1]=[rnd[1]]                 // rnd=key[(tx+ty)&255]
-        (p16)   ld1     dat[0]=[inp],1          }       // dat=*(inp++)
-.pred.rel       "mutex",p20,p21
-{ .mmi; (p21)   add     yy=yy,tx[1]                     // (p16)
-        (p20)   add     yy=yy,tx[0]                     // (p16) y+=tx
-        (p21)   mov     tx[0]=tx[1]             };;     // (p16)
-{ .mmi; (p17)   STKEY   [key_y[1]]=tx[1]                // key[yy]=tx
-        (p17)   STKEY   [key_x[2]]=ty[0]                // key[xx]=ty
-        (p16)   dep     key_y[0]=yy,r0,OFF,8    }       // &key[yy&255]
-{ .mmb; (p17)   add     rnd[0]=tx[1],ty[0]              // tx+=ty
-        (p18)   xor     dat[2]=dat[2],rnd[1]            // dat^=rnd
-        br.ctop.sptk    .Ltop                   };;
-.Lexit:
-{ .mib; STKEY   [key]=yy,-SZ                    // save key->y
-        mov     pr=prsave,0x1ffff
-        nop.b   0                       }
-{ .mib; st1     [out]=dat[3],1                  // compensate for truncated
-                                                // epilogue counter
-        add     xx=-1,xx
-        nop.b   0                       };;
-{ .mib; STKEY   [key]=xx                        // save key->x
-        mov     ar.lc=r3
-        br.ret.sptk.many        b0      };;
-.endp   RC4#
diff --git a/src/lib/libcrypto/rsa/rsa_eng.c b/src/lib/libcrypto/rsa/rsa_eng.c
deleted file mode 100644
index 383a7045b2..0000000000
--- a/src/lib/libcrypto/rsa/rsa_eng.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* crypto/rsa/rsa_lib.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
-#include <openssl/lhash.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-
-const char RSA_version[]="RSA" OPENSSL_VERSION_PTEXT;
-
-static const RSA_METHOD *default_RSA_meth=NULL;
-
-RSA *RSA_new(void)
-        {
-        RSA *r=RSA_new_method(NULL);
-
-        return r;
-        }
-
-void RSA_set_default_method(const RSA_METHOD *meth)
-        {
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(meth->flags & RSA_FLAG_FIPS_METHOD))
-                {
-                RSAerr(RSA_F_RSA_SET_DEFAULT_METHOD, RSA_R_NON_FIPS_METHOD);
-                return;
-                }
-#endif
-        default_RSA_meth = meth;
-        }
-
-const RSA_METHOD *RSA_get_default_method(void)
-        {
-        if (default_RSA_meth == NULL)
-                {
-#ifdef RSA_NULL
-                default_RSA_meth=RSA_null_method();
-#else
-#if 0 /* was: #ifdef RSAref */
-                default_RSA_meth=RSA_PKCS1_RSAref();
-#else
-                default_RSA_meth=RSA_PKCS1_SSLeay();
-#endif
-#endif
-                }
-
-        return default_RSA_meth;
-        }
-
-const RSA_METHOD *RSA_get_method(const RSA *rsa)
-        {
-        return rsa->meth;
-        }
-
-int RSA_set_method(RSA *rsa, const RSA_METHOD *meth)
-        {
-        /* NB: The caller is specifically setting a method, so it's not up to us
-         * to deal with which ENGINE it comes from. */
-        const RSA_METHOD *mtmp;
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(meth->flags & RSA_FLAG_FIPS_METHOD))
-                {
-                RSAerr(RSA_F_RSA_SET_METHOD, RSA_R_NON_FIPS_METHOD);
-                return 0;
-                }
-#endif
-        mtmp = rsa->meth;
-        if (mtmp->finish) mtmp->finish(rsa);
-#ifndef OPENSSL_NO_ENGINE
-        if (rsa->engine)
-                {
-                ENGINE_finish(rsa->engine);
-                rsa->engine = NULL;
-                }
-#endif
-        rsa->meth = meth;
-        if (meth->init) meth->init(rsa);
-        return 1;
-        }
-
-RSA *RSA_new_method(ENGINE *engine)
-        {
-        RSA *ret;
-
-        ret=(RSA *)OPENSSL_malloc(sizeof(RSA));
-        if (ret == NULL)
-                {
-                RSAerr(RSA_F_RSA_NEW_METHOD,ERR_R_MALLOC_FAILURE);
-                return NULL;
-                }
-
-        ret->meth = RSA_get_default_method();
-#ifndef OPENSSL_NO_ENGINE
-        if (engine)
-                {
-                if (!ENGINE_init(engine))
-                        {
-                        RSAerr(RSA_F_RSA_NEW_METHOD, ERR_R_ENGINE_LIB);
-                        OPENSSL_free(ret);
-                        return NULL;
-                        }
-                ret->engine = engine;
-                }
-        else
-                ret->engine = ENGINE_get_default_RSA();
-        if(ret->engine)
-                {
-                ret->meth = ENGINE_get_RSA(ret->engine);
-                if(!ret->meth)
-                        {
-                        RSAerr(RSA_F_RSA_NEW_METHOD,
-                                ERR_R_ENGINE_LIB);
-                        ENGINE_finish(ret->engine);
-                        OPENSSL_free(ret);
-                        return NULL;
-                        }
-                }
-#endif
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(ret->meth->flags & RSA_FLAG_FIPS_METHOD))
-                {
-                RSAerr(RSA_F_RSA_NEW_METHOD, RSA_R_NON_FIPS_METHOD);
-#ifndef OPENSSL_NO_ENGINE
-                if (ret->engine)
-                        ENGINE_finish(ret->engine);
-#endif
-                OPENSSL_free(ret);
-                return NULL;
-                }
-#endif
-
-        ret->pad=0;
-        ret->version=0;
-        ret->n=NULL;
-        ret->e=NULL;
-        ret->d=NULL;
-        ret->p=NULL;
-        ret->q=NULL;
-        ret->dmp1=NULL;
-        ret->dmq1=NULL;
-        ret->iqmp=NULL;
-        ret->references=1;
-        ret->_method_mod_n=NULL;
-        ret->_method_mod_p=NULL;
-        ret->_method_mod_q=NULL;
-        ret->blinding=NULL;
-        ret->mt_blinding=NULL;
-        ret->bignum_data=NULL;
-        ret->flags=ret->meth->flags;
-        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data);
-        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
-                {
-#ifndef OPENSSL_NO_ENGINE
-                if (ret->engine)
-                        ENGINE_finish(ret->engine);
-#endif
-                CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data);
-                OPENSSL_free(ret);
-                ret=NULL;
-                }
-        return(ret);
-        }
-
-void RSA_free(RSA *r)
-        {
-        int i;
-
-        if (r == NULL) return;
-
-        i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_RSA);
-#ifdef REF_PRINT
-        REF_PRINT("RSA",r);
-#endif
-        if (i > 0) return;
-#ifdef REF_CHECK
-        if (i < 0)
-                {
-                fprintf(stderr,"RSA_free, bad reference count\n");
-                abort();
-                }
-#endif
-
-        if (r->meth->finish)
-                r->meth->finish(r);
-#ifndef OPENSSL_NO_ENGINE
-        if (r->engine)
-                ENGINE_finish(r->engine);
-#endif
-
-        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data);
-
-        if (r->n != NULL) BN_clear_free(r->n);
-        if (r->e != NULL) BN_clear_free(r->e);
-        if (r->d != NULL) BN_clear_free(r->d);
-        if (r->p != NULL) BN_clear_free(r->p);
-        if (r->q != NULL) BN_clear_free(r->q);
-        if (r->dmp1 != NULL) BN_clear_free(r->dmp1);
-        if (r->dmq1 != NULL) BN_clear_free(r->dmq1);
-        if (r->iqmp != NULL) BN_clear_free(r->iqmp);
-        if (r->blinding != NULL) BN_BLINDING_free(r->blinding);
-        if (r->mt_blinding != NULL) BN_BLINDING_free(r->mt_blinding);
-        if (r->bignum_data != NULL) OPENSSL_free_locked(r->bignum_data);
-        OPENSSL_free(r);
-        }
-
-int RSA_up_ref(RSA *r)
-        {
-        int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_RSA);
-#ifdef REF_PRINT
-        REF_PRINT("RSA",r);
-#endif
-#ifdef REF_CHECK
-        if (i < 2)
-                {
-                fprintf(stderr, "RSA_up_ref, bad reference count\n");
-                abort();
-                }
-#endif
-        return ((i > 1) ? 1 : 0);
-        }
-
-int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
-        {
-        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_RSA, argl, argp,
-                                new_func, dup_func, free_func);
-        }
-
-int RSA_set_ex_data(RSA *r, int idx, void *arg)
-        {
-        return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
-        }
-
-void *RSA_get_ex_data(const RSA *r, int idx)
-        {
-        return(CRYPTO_get_ex_data(&r->ex_data,idx));
-        }
-
-int RSA_flags(const RSA *r)
-        {
-        return((r == NULL)?0:r->meth->flags);
-        }
-
-int RSA_memory_lock(RSA *r)
-        {
-        int i,j,k,off;
-        char *p;
-        BIGNUM *bn,**t[6],*b;
-        BN_ULONG *ul;
-
-        if (r->d == NULL) return(1);
-        t[0]= &r->d;
-        t[1]= &r->p;
-        t[2]= &r->q;
-        t[3]= &r->dmp1;
-        t[4]= &r->dmq1;
-        t[5]= &r->iqmp;
-        k=sizeof(BIGNUM)*6;
-        off=k/sizeof(BN_ULONG)+1;
-        j=1;
-        for (i=0; i<6; i++)
-                j+= (*t[i])->top;
-        if ((p=OPENSSL_malloc_locked((off+j)*sizeof(BN_ULONG))) == NULL)
-                {
-                RSAerr(RSA_F_RSA_MEMORY_LOCK,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        bn=(BIGNUM *)p;
-        ul=(BN_ULONG *)&(p[off]);
-        for (i=0; i<6; i++)
-                {
-                b= *(t[i]);
-                *(t[i])= &(bn[i]);
-                memcpy((char *)&(bn[i]),(char *)b,sizeof(BIGNUM));
-                bn[i].flags=BN_FLG_STATIC_DATA;
-                bn[i].d=ul;
-                memcpy((char *)ul,b->d,sizeof(BN_ULONG)*b->top);
-                ul+=b->top;
-                BN_clear_free(b);
-                }
-        
-        /* I should fix this so it can still be done */
-        r->flags&= ~(RSA_FLAG_CACHE_PRIVATE|RSA_FLAG_CACHE_PUBLIC);
-
-        r->bignum_data=p;
-        return(1);
-        }
diff --git a/src/lib/libcrypto/rsa/rsa_x931g.c b/src/lib/libcrypto/rsa/rsa_x931g.c
deleted file mode 100644
index bf94f8be7a..0000000000
--- a/src/lib/libcrypto/rsa/rsa_x931g.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* crypto/rsa/rsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-
-#ifndef OPENSSL_FIPS
-
-/* X9.31 RSA key derivation and generation */
-
-int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2,
-                        const BIGNUM *Xp1, const BIGNUM *Xp2, const BIGNUM *Xp,
-                        const BIGNUM *Xq1, const BIGNUM *Xq2, const BIGNUM *Xq,
-                        const BIGNUM *e, BN_GENCB *cb)
-        {
-        BIGNUM *r0=NULL,*r1=NULL,*r2=NULL,*r3=NULL;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-
-        if (!rsa) 
-                goto err;
-
-        ctx = BN_CTX_new();
-        if (!ctx) 
-                goto err;
-        BN_CTX_start(ctx);
-
-        r0 = BN_CTX_get(ctx);
-        r1 = BN_CTX_get(ctx);
-        r2 = BN_CTX_get(ctx);
-        r3 = BN_CTX_get(ctx);
-
-        if (r3 == NULL)
-                goto err;
-        if (!rsa->e)
-                {
-                rsa->e = BN_dup(e);
-                if (!rsa->e)
-                        goto err;
-                }
-        else
-                e = rsa->e;
-
-        /* If not all parameters present only calculate what we can.
-         * This allows test programs to output selective parameters.
-         */
-
-        if (Xp && !rsa->p)
-                {
-                rsa->p = BN_new();
-                if (!rsa->p)
-                        goto err;
-
-                if (!BN_X931_derive_prime_ex(rsa->p, p1, p2,
-                                        Xp, Xp1, Xp2, e, ctx, cb))
-                        goto err;
-                }
-
-        if (Xq && !rsa->q)
-                {
-                rsa->q = BN_new();
-                if (!rsa->q)
-                        goto err;
-                if (!BN_X931_derive_prime_ex(rsa->q, q1, q2,
-                                        Xq, Xq1, Xq2, e, ctx, cb))
-                        goto err;
-                }
-
-        if (!rsa->p || !rsa->q)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                return 2;
-                }
-
-        /* Since both primes are set we can now calculate all remaining 
-         * components.
-         */
-
-        /* calculate n */
-        rsa->n=BN_new();
-        if (rsa->n == NULL)
-                goto err;
-        if (!BN_mul(rsa->n,rsa->p,rsa->q,ctx))
-                goto err;
-
-        /* calculate d */
-        if (!BN_sub(r1,rsa->p,BN_value_one()))
-                goto err;       /* p-1 */
-        if (!BN_sub(r2,rsa->q,BN_value_one()))
-                goto err;       /* q-1 */
-        if (!BN_mul(r0,r1,r2,ctx))
-                goto err;       /* (p-1)(q-1) */
-
-        if (!BN_gcd(r3, r1, r2, ctx))
-                goto err;
-
-        if (!BN_div(r0, NULL, r0, r3, ctx))
-                goto err;       /* LCM((p-1)(q-1)) */
-
-        ctx2 = BN_CTX_new();
-        if (!ctx2)
-                goto err;
-
-        rsa->d=BN_mod_inverse(NULL,rsa->e,r0,ctx2);     /* d */
-        if (rsa->d == NULL)
-                goto err;
-
-        /* calculate d mod (p-1) */
-        rsa->dmp1=BN_new();
-        if (rsa->dmp1 == NULL)
-                goto err;
-        if (!BN_mod(rsa->dmp1,rsa->d,r1,ctx))
-                goto err;
-
-        /* calculate d mod (q-1) */
-        rsa->dmq1=BN_new();
-        if (rsa->dmq1 == NULL)
-                goto err;
-        if (!BN_mod(rsa->dmq1,rsa->d,r2,ctx))
-                goto err;
-
-        /* calculate inverse of q mod p */
-        rsa->iqmp=BN_mod_inverse(NULL,rsa->q,rsa->p,ctx2);
-
-        err:
-        if (ctx)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                }
-        if (ctx2)
-                BN_CTX_free(ctx2);
-        /* If this is set all calls successful */
-        if (rsa && rsa->iqmp != NULL)
-                return 1;
-
-        return 0;
-
-        }
-
-int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e, BN_GENCB *cb)
-        {
-        int ok = 0;
-        BIGNUM *Xp = NULL, *Xq = NULL;
-        BN_CTX *ctx = NULL;
-        
-        ctx = BN_CTX_new();
-        if (!ctx)
-                goto error;
-
-        BN_CTX_start(ctx);
-        Xp = BN_CTX_get(ctx);
-        Xq = BN_CTX_get(ctx);
-        if (!BN_X931_generate_Xpq(Xp, Xq, bits, ctx))
-                goto error;
-
-        rsa->p = BN_new();
-        rsa->q = BN_new();
-        if (!rsa->p || !rsa->q)
-                goto error;
-
-        /* Generate two primes from Xp, Xq */
-
-        if (!BN_X931_generate_prime_ex(rsa->p, NULL, NULL, NULL, NULL, Xp,
-                                        e, ctx, cb))
-                goto error;
-
-        if (!BN_X931_generate_prime_ex(rsa->q, NULL, NULL, NULL, NULL, Xq,
-                                        e, ctx, cb))
-                goto error;
-
-        /* Since rsa->p and rsa->q are valid this call will just derive
-         * remaining RSA components.
-         */
-
-        if (!RSA_X931_derive_ex(rsa, NULL, NULL, NULL, NULL,
-                                NULL, NULL, NULL, NULL, NULL, NULL, e, cb))
-                goto error;
-
-        ok = 1;
-
-        error:
-        if (ctx)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                }
-
-        if (ok)
-                return 1;
-
-        return 0;
-
-        }
-
-#endif
diff --git a/src/lib/libcrypto/seed/Makefile b/src/lib/libcrypto/seed/Makefile
new file mode 100644
index 0000000000..4bc55e4916
--- /dev/null
+++ b/src/lib/libcrypto/seed/Makefile
@@ -0,0 +1,106 @@
+#
+# crypto/seed/Makefile
+#
+
+DIR=    seed
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
+LIBOBJ=seed.o seed_ecb.o seed_cbc.o seed_cfb.o seed_ofb.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= seed.h
+HEADER= seed_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+seed.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+seed.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+seed.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+seed.o: ../../include/openssl/seed.h ../../include/openssl/stack.h
+seed.o: ../../include/openssl/symhacks.h seed.c seed_locl.h
+seed_cbc.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+seed_cbc.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h
+seed_cbc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+seed_cbc.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h
+seed_cbc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+seed_cbc.o: seed_cbc.c
+seed_cfb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+seed_cfb.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h
+seed_cfb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+seed_cfb.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h
+seed_cfb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+seed_cfb.o: seed_cfb.c
+seed_ecb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+seed_ecb.o: ../../include/openssl/opensslconf.h
+seed_ecb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+seed_ecb.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h
+seed_ecb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+seed_ecb.o: seed_ecb.c
+seed_ofb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+seed_ofb.o: ../../include/openssl/modes.h ../../include/openssl/opensslconf.h
+seed_ofb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+seed_ofb.o: ../../include/openssl/safestack.h ../../include/openssl/seed.h
+seed_ofb.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+seed_ofb.o: seed_ofb.c
diff --git a/src/lib/libcrypto/seed/seed.c b/src/lib/libcrypto/seed/seed.c
new file mode 100644
index 0000000000..2bc384a19f
--- /dev/null
+++ b/src/lib/libcrypto/seed/seed.c
@@ -0,0 +1,325 @@
+/*
+ * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.  
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of author nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``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 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.
+ *
+ */
+#ifndef OPENSSL_NO_SEED
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef WIN32
+#include <memory.h>
+#endif
+
+#include <openssl/seed.h>
+#include "seed_locl.h"
+
+static const seed_word SS[4][256] = {   {
+        0x2989a1a8, 0x05858184, 0x16c6d2d4, 0x13c3d3d0, 0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
+        0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c, 0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360,
+        0x28082028, 0x04444044, 0x20002020, 0x1d8d919c, 0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314,
+        0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378, 0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec,
+        0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8, 0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074,
+        0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354, 0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100,
+        0x24042024, 0x1c0c101c, 0x33437370, 0x18889098, 0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8,
+        0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380, 0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8,
+        0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8, 0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c,
+        0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078, 0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4,
+        0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140, 0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008,
+        0x1f0f131c, 0x19899198, 0x00000000, 0x19091118, 0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0,
+        0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324, 0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8,
+        0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c, 0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208,
+        0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4, 0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064,
+        0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218, 0x06060204, 0x21012120, 0x2b4b6368, 0x26466264,
+        0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288, 0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0,
+        0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4, 0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc,
+        0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac, 0x36063234, 0x15051114, 0x22022220, 0x38083038,
+        0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c, 0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394,
+        0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c, 0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188,
+        0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8, 0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4,
+        0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364, 0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8,
+        0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320, 0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4,
+        0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0, 0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040,
+        0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0, 0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154,
+        0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c, 0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254,
+        0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244, 0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8,
+        0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c, 0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0,
+        0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c, 0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088,
+        0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4, 0x22426260, 0x29092128, 0x07070304, 0x33033330,
+        0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178, 0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298
+},      {
+        0x38380830, 0xe828c8e0, 0x2c2d0d21, 0xa42686a2, 0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0,
+        0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3, 0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53,
+        0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1, 0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3,
+        0xd013c3d3, 0x90118191, 0x10110111, 0x04060602, 0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43,
+        0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0, 0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0,
+        0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2, 0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890,
+        0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32, 0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3,
+        0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72, 0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272,
+        0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0, 0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83,
+        0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13, 0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430,
+        0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1, 0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0,
+        0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1, 0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1,
+        0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131, 0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1,
+        0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202, 0x20220222, 0x04040400, 0x68284860, 0x70314171,
+        0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991, 0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951,
+        0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0, 0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0,
+        0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12, 0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3,
+        0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2, 0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41,
+        0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32, 0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62,
+        0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292, 0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0,
+        0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571, 0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303,
+        0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470, 0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901,
+        0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040, 0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501,
+        0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22, 0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343,
+        0x84058581, 0x14140410, 0x88098981, 0x981b8b93, 0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971,
+        0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282, 0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53,
+        0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11, 0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642,
+        0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3, 0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1,
+        0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30, 0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70,
+        0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622, 0x30320232, 0x84048480, 0x68294961, 0x90138393,
+        0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0, 0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783,
+        0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83, 0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3
+},      {
+        0xa1a82989, 0x81840585, 0xd2d416c6, 0xd3d013c3, 0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505,
+        0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e, 0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343,
+        0x20282808, 0x40440444, 0x20202000, 0x919c1d8d, 0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707,
+        0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b, 0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece,
+        0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888, 0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444,
+        0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747, 0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101,
+        0x20242404, 0x101c1c0c, 0x73703343, 0x90981888, 0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9,
+        0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383, 0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9,
+        0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb, 0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f,
+        0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848, 0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5,
+        0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141, 0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808,
+        0x131c1f0f, 0x91981989, 0x00000000, 0x11181909, 0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1,
+        0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707, 0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b,
+        0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d, 0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a,
+        0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5, 0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444,
+        0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a, 0x02040606, 0x21202101, 0x63682b4b, 0x62642646,
+        0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a, 0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0,
+        0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5, 0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf,
+        0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e, 0x32343606, 0x11141505, 0x22202202, 0x30383808,
+        0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c, 0x81800181, 0xe1e829c9, 0x80840484, 0x93941787,
+        0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c, 0x71703141, 0x11101101, 0xc3c407c7, 0x81880989,
+        0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8, 0x90941484, 0x51581949, 0x82800282, 0xc0c404c4,
+        0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747, 0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888,
+        0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303, 0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484,
+        0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2, 0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040,
+        0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1, 0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545,
+        0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f, 0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646,
+        0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646, 0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca,
+        0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f, 0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282,
+        0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f, 0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888,
+        0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4, 0x62602242, 0x21282909, 0x03040707, 0x33303303,
+        0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949, 0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a
+},      {
+        0x08303838, 0xc8e0e828, 0x0d212c2d, 0x86a2a426, 0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838,
+        0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407, 0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b,
+        0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435, 0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427,
+        0xc3d3d013, 0x81919011, 0x01111011, 0x06020406, 0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b,
+        0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828, 0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434,
+        0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416, 0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818,
+        0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e, 0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f,
+        0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a, 0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032,
+        0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000, 0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b,
+        0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f, 0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434,
+        0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829, 0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838,
+        0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405, 0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839,
+        0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031, 0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031,
+        0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002, 0x02222022, 0x04000404, 0x48606828, 0x41717031,
+        0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819, 0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819,
+        0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c, 0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010,
+        0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a, 0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f,
+        0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022, 0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d,
+        0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a, 0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e,
+        0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012, 0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c,
+        0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435, 0x4f737c3f, 0x05313435, 0x00101010, 0x03030003,
+        0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434, 0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809,
+        0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000, 0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405,
+        0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a, 0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003,
+        0x85818405, 0x04101414, 0x89818809, 0x8b93981b, 0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839,
+        0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002, 0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f,
+        0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d, 0x05212425, 0x4f434c0f, 0x00000000, 0x46424406,
+        0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b, 0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d,
+        0x00303030, 0x85919415, 0x45616425, 0x0c303c3c, 0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c,
+        0x0e020c0e, 0x40505010, 0x09313839, 0x06222426, 0x02323032, 0x84808404, 0x49616829, 0x83939013,
+        0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424, 0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407,
+        0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f, 0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437
+}       };
+
+/* key schedule constants - golden ratio */
+#define KC0     0x9e3779b9
+#define KC1     0x3c6ef373
+#define KC2     0x78dde6e6
+#define KC3     0xf1bbcdcc
+#define KC4     0xe3779b99
+#define KC5     0xc6ef3733
+#define KC6     0x8dde6e67
+#define KC7     0x1bbcdccf
+#define KC8     0x3779b99e
+#define KC9     0x6ef3733c
+#define KC10    0xdde6e678
+#define KC11    0xbbcdccf1
+#define KC12    0x779b99e3
+#define KC13    0xef3733c6
+#define KC14    0xde6e678d
+#define KC15    0xbcdccf1b
+
+#if defined(OPENSSL_SMALL_FOOTPRINT)
+static const seed_word KC[] = {
+        KC0,    KC1,    KC2,    KC3,    KC4,    KC5,    KC6,    KC7,
+        KC8,    KC9,    KC10,   KC11,   KC12,   KC13,   KC14,   KC15    };
+#endif
+
+void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks)
+{
+        seed_word x1, x2, x3, x4;
+        seed_word t0, t1;
+
+        char2word(rawkey   , x1);
+        char2word(rawkey+4 , x2);
+        char2word(rawkey+8 , x3);
+        char2word(rawkey+12, x4);
+
+        t0 = (x1 + x3 - KC0) & 0xffffffff;
+        t1 = (x2 - x4 + KC0) & 0xffffffff;                     KEYUPDATE_TEMP(t0, t1, &ks->data[0]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC1);      KEYUPDATE_TEMP(t0, t1, &ks->data[2]);
+
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC2);      KEYUPDATE_TEMP(t0, t1, &ks->data[4]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC3);      KEYUPDATE_TEMP(t0, t1, &ks->data[6]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC4);      KEYUPDATE_TEMP(t0, t1, &ks->data[8]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC5);      KEYUPDATE_TEMP(t0, t1, &ks->data[10]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC6);      KEYUPDATE_TEMP(t0, t1, &ks->data[12]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC7);      KEYUPDATE_TEMP(t0, t1, &ks->data[14]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC8);      KEYUPDATE_TEMP(t0, t1, &ks->data[16]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC9);      KEYUPDATE_TEMP(t0, t1, &ks->data[18]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC10);     KEYUPDATE_TEMP(t0, t1, &ks->data[20]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC11);     KEYUPDATE_TEMP(t0, t1, &ks->data[22]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC12);     KEYUPDATE_TEMP(t0, t1, &ks->data[24]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC13);     KEYUPDATE_TEMP(t0, t1, &ks->data[26]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC14);     KEYUPDATE_TEMP(t0, t1, &ks->data[28]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC15);     KEYUPDATE_TEMP(t0, t1, &ks->data[30]);
+#else
+        {
+            int i;
+            for (i=2; i<16; i+=2) {
+                KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC[i]);
+                KEYUPDATE_TEMP(t0, t1, &ks->data[i*2]);
+                KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC[i+1]);
+                KEYUPDATE_TEMP(t0, t1, &ks->data[i*2+2]);
+            }
+        }
+#endif
+}
+
+void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks)
+{
+        seed_word x1, x2, x3, x4;
+        seed_word t0, t1;
+
+        char2word(s,    x1);
+        char2word(s+4,  x2);
+        char2word(s+8,  x3);
+        char2word(s+12, x4);
+
+#if !defined(OPENSSL_SMALL_FOOTPRINT)   
+        E_SEED(t0, t1, x1, x2, x3, x4, 0);
+        E_SEED(t0, t1, x3, x4, x1, x2, 2);
+        E_SEED(t0, t1, x1, x2, x3, x4, 4);
+        E_SEED(t0, t1, x3, x4, x1, x2, 6);
+        E_SEED(t0, t1, x1, x2, x3, x4, 8);
+        E_SEED(t0, t1, x3, x4, x1, x2, 10);
+        E_SEED(t0, t1, x1, x2, x3, x4, 12);
+        E_SEED(t0, t1, x3, x4, x1, x2, 14);
+        E_SEED(t0, t1, x1, x2, x3, x4, 16);
+        E_SEED(t0, t1, x3, x4, x1, x2, 18);
+        E_SEED(t0, t1, x1, x2, x3, x4, 20);
+        E_SEED(t0, t1, x3, x4, x1, x2, 22);
+        E_SEED(t0, t1, x1, x2, x3, x4, 24);
+        E_SEED(t0, t1, x3, x4, x1, x2, 26);
+        E_SEED(t0, t1, x1, x2, x3, x4, 28);
+        E_SEED(t0, t1, x3, x4, x1, x2, 30);
+#else
+        {
+            int i;
+            for (i=0;i<30;i+=4) {
+                E_SEED(t0,t1,x1,x2,x3,x4,i);
+                E_SEED(t0,t1,x3,x4,x1,x2,i+2);
+            }
+        }
+#endif
+
+        word2char(x3, d);
+        word2char(x4, d+4);
+        word2char(x1, d+8);
+        word2char(x2, d+12);
+}
+
+void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks)
+{
+        seed_word x1, x2, x3, x4;
+        seed_word t0, t1;
+
+        char2word(s,    x1);
+        char2word(s+4,  x2);
+        char2word(s+8,  x3);
+        char2word(s+12, x4);
+
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
+        E_SEED(t0, t1, x1, x2, x3, x4, 30);
+        E_SEED(t0, t1, x3, x4, x1, x2, 28);
+        E_SEED(t0, t1, x1, x2, x3, x4, 26);
+        E_SEED(t0, t1, x3, x4, x1, x2, 24);
+        E_SEED(t0, t1, x1, x2, x3, x4, 22);
+        E_SEED(t0, t1, x3, x4, x1, x2, 20);
+        E_SEED(t0, t1, x1, x2, x3, x4, 18);
+        E_SEED(t0, t1, x3, x4, x1, x2, 16);
+        E_SEED(t0, t1, x1, x2, x3, x4, 14);
+        E_SEED(t0, t1, x3, x4, x1, x2, 12);
+        E_SEED(t0, t1, x1, x2, x3, x4, 10);
+        E_SEED(t0, t1, x3, x4, x1, x2, 8);
+        E_SEED(t0, t1, x1, x2, x3, x4, 6);
+        E_SEED(t0, t1, x3, x4, x1, x2, 4);
+        E_SEED(t0, t1, x1, x2, x3, x4, 2);
+        E_SEED(t0, t1, x3, x4, x1, x2, 0);
+#else
+        {
+            int i;
+            for (i=30; i>0; i-=4) {
+                E_SEED(t0, t1, x1, x2, x3, x4, i);
+                E_SEED(t0, t1, x3, x4, x1, x2, i-2);
+
+            }
+        }
+#endif
+
+        word2char(x3, d);
+        word2char(x4, d+4);
+        word2char(x1, d+8);
+        word2char(x2, d+12);
+}
+
+#endif /* OPENSSL_NO_SEED */
diff --git a/src/lib/libcrypto/seed/seed.h b/src/lib/libcrypto/seed/seed.h
new file mode 100644
index 0000000000..6ffa5f024e
--- /dev/null
+++ b/src/lib/libcrypto/seed/seed.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.  
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of author nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``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 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.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#ifndef HEADER_SEED_H
+#define HEADER_SEED_H
+
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
+#include <openssl/crypto.h>
+
+#ifdef OPENSSL_NO_SEED
+#error SEED is disabled.
+#endif
+
+#ifdef AES_LONG /* look whether we need 'long' to get 32 bits */
+# ifndef SEED_LONG
+#  define SEED_LONG 1
+# endif
+#endif
+
+#if !defined(NO_SYS_TYPES_H)
+# include <sys/types.h>
+#endif
+
+#define SEED_BLOCK_SIZE 16
+#define SEED_KEY_LENGTH 16
+
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+typedef struct seed_key_st {
+#ifdef SEED_LONG
+    unsigned long data[32];
+#else
+    unsigned int data[32];
+#endif
+} SEED_KEY_SCHEDULE;
+
+
+void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks);
+
+void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks);
+void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks);
+
+void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc);
+void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out,
+        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int enc);
+void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int *num, int enc);
+void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int *num);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* HEADER_SEED_H */
diff --git a/src/lib/libcrypto/seed/seed_cbc.c b/src/lib/libcrypto/seed/seed_cbc.c
new file mode 100644
index 0000000000..6c3f9b527a
--- /dev/null
+++ b/src/lib/libcrypto/seed/seed_cbc.c
@@ -0,0 +1,63 @@
+/* crypto/seed/seed_cbc.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include <openssl/seed.h>
+#include <openssl/modes.h>
+
+void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                      size_t len, const SEED_KEY_SCHEDULE *ks,
+                      unsigned char ivec[SEED_BLOCK_SIZE], int enc)
+        {
+        if (enc)
+                CRYPTO_cbc128_encrypt(in,out,len,ks,ivec,(block128_f)SEED_encrypt);
+        else
+                CRYPTO_cbc128_decrypt(in,out,len,ks,ivec,(block128_f)SEED_decrypt);
+        }
diff --git a/src/lib/libcrypto/seed/seed_cfb.c b/src/lib/libcrypto/seed/seed_cfb.c
new file mode 100644
index 0000000000..694597dd06
--- /dev/null
+++ b/src/lib/libcrypto/seed/seed_cfb.c
@@ -0,0 +1,116 @@
+/* crypto/seed/seed_cfb.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <openssl/seed.h>
+#include <openssl/modes.h>
+
+void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+                         size_t len, const SEED_KEY_SCHEDULE *ks,
+                         unsigned char ivec[SEED_BLOCK_SIZE], int *num, int enc)
+        {
+        CRYPTO_cfb128_encrypt(in,out,len,ks,ivec,num,enc,(block128_f)SEED_encrypt);
+        }
diff --git a/src/lib/libssl/src/fips/fips_locl.h b/src/lib/libcrypto/seed/seed_ecb.c
index 03fed36e3c..e63f5ae14e 100644
--- a/src/lib/libssl/src/fips/fips_locl.h
+++ b/src/lib/libcrypto/seed/seed_ecb.c
@@ -1,5 +1,6 @@
+/* crypto/seed/seed_ecb.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2007 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -44,30 +45,16 @@
  * 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.
+ * ====================================================================
  *
  */
 
-#ifdef OPENSSL_FIPS
+#include <openssl/seed.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-void fips_w_lock(void);
-void fips_w_unlock(void);
-void fips_r_lock(void);
-void fips_r_unlock(void);
-int fips_is_started(void);
-void fips_set_started(void);
-int fips_is_owning_thread(void);
-int fips_set_owning_thread(void);
-void fips_set_selftest_fail(void);
-int fips_clear_owning_thread(void);
-unsigned char *fips_signature_witness(void);
-
-#define FIPS_MAX_CIPHER_TEST_SIZE       16
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
+void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc) 
+        {
+        if (enc)
+                SEED_encrypt(in, out, ks);
+        else
+                SEED_decrypt(in, out, ks);
+        }
diff --git a/src/lib/libcrypto/seed/seed_locl.h b/src/lib/libcrypto/seed/seed_locl.h
new file mode 100644
index 0000000000..fd456b6422
--- /dev/null
+++ b/src/lib/libcrypto/seed/seed_locl.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.  
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of author nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``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 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.
+ *
+ */
+#ifndef HEADER_SEED_LOCL_H
+#define HEADER_SEED_LOCL_H
+
+#include "openssl/e_os2.h"
+#include <openssl/seed.h>
+
+
+#ifdef SEED_LONG /* need 32-bit type */
+typedef unsigned long seed_word;
+#else
+typedef unsigned int seed_word;
+#endif
+
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define G_FUNC(v)       \
+        SS[0][(unsigned char)      (v) & 0xff] ^ SS[1][(unsigned char) ((v)>>8) & 0xff] ^ \
+        SS[2][(unsigned char)((v)>>16) & 0xff] ^ SS[3][(unsigned char)((v)>>24) & 0xff]
+
+#define char2word(c, i)  \
+        (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3]))
+
+#define word2char(l, c)  \
+        *((c)+0) = (unsigned char)((l)>>24) & 0xff; \
+        *((c)+1) = (unsigned char)((l)>>16) & 0xff; \
+        *((c)+2) = (unsigned char)((l)>> 8) & 0xff; \
+        *((c)+3) = (unsigned char)((l))     & 0xff
+
+#define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC)  \
+        (T0) = (X3);                                     \
+        (X3) = (((X3)<<8) ^ ((X4)>>24)) & 0xffffffff;    \
+        (X4) = (((X4)<<8) ^ ((T0)>>24)) & 0xffffffff;    \
+        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;    \
+        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
+
+#define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC)  \
+        (T0) = (X1);                                     \
+        (X1) = (((X1)>>8) ^ ((X2)<<24)) & 0xffffffff;    \
+        (X2) = (((X2)>>8) ^ ((T0)<<24)) & 0xffffffff;    \
+        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;     \
+        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
+
+#define KEYUPDATE_TEMP(T0, T1, K)   \
+        (K)[0] = G_FUNC((T0));      \
+        (K)[1] = G_FUNC((T1))
+
+#define XOR_SEEDBLOCK(DST, SRC)      \
+        ((DST))[0] ^= ((SRC))[0];    \
+        ((DST))[1] ^= ((SRC))[1];    \
+        ((DST))[2] ^= ((SRC))[2];    \
+        ((DST))[3] ^= ((SRC))[3]
+
+#define MOV_SEEDBLOCK(DST, SRC)      \
+        ((DST))[0] = ((SRC))[0];     \
+        ((DST))[1] = ((SRC))[1];     \
+        ((DST))[2] = ((SRC))[2];     \
+        ((DST))[3] = ((SRC))[3]
+
+# define CHAR2WORD(C, I)              \
+        char2word((C),    (I)[0]);    \
+        char2word((C+4),  (I)[1]);    \
+        char2word((C+8),  (I)[2]);    \
+        char2word((C+12), (I)[3])
+
+# define WORD2CHAR(I, C)              \
+        word2char((I)[0], (C));       \
+        word2char((I)[1], (C+4));     \
+        word2char((I)[2], (C+8));     \
+        word2char((I)[3], (C+12))
+
+# define E_SEED(T0, T1, X1, X2, X3, X4, rbase)   \
+        (T0) = (X3) ^ (ks->data)[(rbase)];       \
+        (T1) = (X4) ^ (ks->data)[(rbase)+1];     \
+        (T1) ^= (T0);                            \
+        (T1) = G_FUNC((T1));                     \
+        (T0) = ((T0) + (T1)) & 0xffffffff;       \
+        (T0) = G_FUNC((T0));                     \
+        (T1) = ((T1) + (T0)) & 0xffffffff;       \
+        (T1) = G_FUNC((T1));                     \
+        (T0) = ((T0) + (T1)) & 0xffffffff;       \
+        (X1) ^= (T0);                            \
+        (X2) ^= (T1)
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* HEADER_SEED_LOCL_H */
diff --git a/src/lib/libssl/src/fips/dh/fips_dh_check.c b/src/lib/libcrypto/seed/seed_ofb.c
index 7333f7c80f..3c8ba33bb9 100644
--- a/src/lib/libssl/src/fips/dh/fips_dh_check.c
+++ b/src/lib/libcrypto/seed/seed_ofb.c
@@ -1,4 +1,53 @@
-/* crypto/dh/dh_check.c */
+/* crypto/seed/seed_ofb.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,92 +105,12 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include <openssl/bn.h>
-#include <openssl/dh.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-
-/* Check that p is a safe prime and
- * if g is 2, 3 or 5, check that is is a suitable generator
- * where
- * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5
- * for 5, p mod 10 == 3 or 7
- * should hold.
- */
-
-#ifdef OPENSSL_FIPS
+#include <openssl/seed.h>
+#include <openssl/modes.h>
 
-int DH_check(const DH *dh, int *ret)
+void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+                         size_t len, const SEED_KEY_SCHEDULE *ks,
+                         unsigned char ivec[SEED_BLOCK_SIZE], int *num)
         {
-        int ok=0;
-        BN_CTX *ctx=NULL;
-        BN_ULONG l;
-        BIGNUM *q=NULL;
-
-        *ret=0;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        q=BN_new();
-        if (q == NULL) goto err;
-
-        if (BN_is_word(dh->g,DH_GENERATOR_2))
-                {
-                l=BN_mod_word(dh->p,24);
-                if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-#if 0
-        else if (BN_is_word(dh->g,DH_GENERATOR_3))
-                {
-                l=BN_mod_word(dh->p,12);
-                if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-#endif
-        else if (BN_is_word(dh->g,DH_GENERATOR_5))
-                {
-                l=BN_mod_word(dh->p,10);
-                if ((l != 3) && (l != 7))
-                        *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-        else
-                *ret|=DH_UNABLE_TO_CHECK_GENERATOR;
-
-        if (!BN_is_prime_ex(dh->p,BN_prime_checks,ctx,NULL))
-                *ret|=DH_CHECK_P_NOT_PRIME;
-        else
-                {
-                if (!BN_rshift1(q,dh->p)) goto err;
-                if (!BN_is_prime_ex(q,BN_prime_checks,ctx,NULL))
-                        *ret|=DH_CHECK_P_NOT_SAFE_PRIME;
-                }
-        ok=1;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (q != NULL) BN_free(q);
-        return(ok);
+        CRYPTO_ofb128_encrypt(in,out,len,ks,ivec,num,(block128_f)SEED_encrypt);
         }
-
-int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
-        {
-        int ok=0;
-        BIGNUM *q=NULL;
-
-        *ret=0;
-        q=BN_new();
-        if (q == NULL) goto err;
-        BN_set_word(q,1);
-        if (BN_cmp(pub_key,q) <= 0)
-                *ret|=DH_CHECK_PUBKEY_TOO_SMALL;
-        BN_copy(q,dh->p);
-        BN_sub_word(q,1);
-        if (BN_cmp(pub_key,q) >= 0)
-                *ret|=DH_CHECK_PUBKEY_TOO_LARGE;
-
-        ok = 1;
-err:
-        if (q != NULL) BN_free(q);
-        return(ok);
-        }
-
-#endif
diff --git a/src/lib/libcrypto/sha/asm/sha512-sse2.pl b/src/lib/libcrypto/sha/asm/sha512-sse2.pl
deleted file mode 100644
index 10902bf673..0000000000
--- a/src/lib/libcrypto/sha/asm/sha512-sse2.pl
+++ /dev/null
@@ -1,404 +0,0 @@
-#!/usr/bin/env perl
-#
-# ====================================================================
-# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
-# project. Rights for redistribution and usage in source and binary
-# forms are granted according to the OpenSSL license.
-# ====================================================================
-#
-# SHA512_Transform_SSE2.
-#
-# As the name suggests, this is an IA-32 SSE2 implementation of
-# SHA512_Transform. Motivating factor for the undertaken effort was that
-# SHA512 was observed to *consistently* perform *significantly* poorer
-# than SHA256 [2x and slower is common] on 32-bit platforms. On 64-bit
-# platforms on the other hand SHA512 tend to outperform SHA256 [~50%
-# seem to be common improvement factor]. All this is perfectly natural,
-# as SHA512 is a 64-bit algorithm. But isn't IA-32 SSE2 essentially
-# a 64-bit instruction set? Is it rich enough to implement SHA512?
-# If answer was "no," then you wouldn't have been reading this...
-#
-# Throughput performance in MBps (larger is better):
-#
-#               2.4GHz P4       1.4GHz AMD32    1.4GHz AMD64(*)
-# SHA256/gcc(*) 54              43              59
-# SHA512/gcc    17              23              92
-# SHA512/sse2   61(**)          57(**)
-# SHA512/icc    26              28
-# SHA256/icc(*) 65              54
-#
-# (*)   AMD64 and SHA256 numbers are presented mostly for amusement or
-#       reference purposes.
-# (**)  I.e. it gives ~2-3x speed-up if compared with compiler generated
-#       code. One can argue that hand-coded *non*-SSE2 implementation
-#       would perform better than compiler generated one as well, and
-#       that comparison is therefore not exactly fair. Well, as SHA512
-#       puts enormous pressure on IA-32 GP register bank, I reckon that
-#       hand-coded version wouldn't perform significantly better than
-#       one compiled with icc, ~20% perhaps... So that this code would
-#       still outperform it with distinguishing marginal. But feel free
-#       to prove me wrong:-)
-#                                               <appro@fy.chalmers.se>
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-&asm_init($ARGV[0],"sha512-sse2.pl",$ARGV[$#ARGV] eq "386");
-
-$K512="esi";    # K512[80] table, found at the end...
-#$W512="esp";   # $W512 is not just W512[16]: it comprises *two* copies
-                # of W512[16] and a copy of A-H variables...
-$W512_SZ=8*(16+16+8);   # see above...
-#$Kidx="ebx";   # index in K512 table, advances from 0 to 80...
-$Widx="edx";    # index in W512, wraps around at 16...
-$data="edi";    # 16 qwords of input data...
-$A="mm0";       # B-D and
-$E="mm1";       # F-H are allocated dynamically...
-$Aoff=256+0;    # A-H offsets relative to $W512...
-$Boff=256+8;
-$Coff=256+16;
-$Doff=256+24;
-$Eoff=256+32;
-$Foff=256+40;
-$Goff=256+48;
-$Hoff=256+56;
-
-sub SHA2_ROUND()
-{ local ($kidx,$widx)=@_;
-
-        # One can argue that one could reorder instructions for better
-        # performance. Well, I tried and it doesn't seem to make any
-        # noticeable difference. Modern out-of-order execution cores
-        # reorder instructions to their liking in either case and they
-        # apparently do decent job. So we can keep the code more
-        # readable/regular/comprehensible:-)
-
-        # I adhere to 64-bit %mmX registers in order to avoid/not care
-        # about #GP exceptions on misaligned 128-bit access, most
-        # notably in paddq with memory operand. Not to mention that
-        # SSE2 intructions operating on %mmX can be scheduled every
-        # cycle [and not every second one if operating on %xmmN].
-
-        &movq   ("mm4",&QWP($Foff,$W512));      # load f
-        &movq   ("mm5",&QWP($Goff,$W512));      # load g
-        &movq   ("mm6",&QWP($Hoff,$W512));      # load h
-
-        &movq   ("mm2",$E);                     # %mm2 is sliding right
-        &movq   ("mm3",$E);                     # %mm3 is sliding left
-        &psrlq  ("mm2",14);
-        &psllq  ("mm3",23);
-        &movq   ("mm7","mm2");                  # %mm7 is T1
-        &pxor   ("mm7","mm3");
-        &psrlq  ("mm2",4);
-        &psllq  ("mm3",23);
-        &pxor   ("mm7","mm2");
-        &pxor   ("mm7","mm3");
-        &psrlq  ("mm2",23);
-        &psllq  ("mm3",4);
-        &pxor   ("mm7","mm2");
-        &pxor   ("mm7","mm3");                  # T1=Sigma1_512(e)
-
-        &movq   (&QWP($Foff,$W512),$E);         # f = e
-        &movq   (&QWP($Goff,$W512),"mm4");      # g = f
-        &movq   (&QWP($Hoff,$W512),"mm5");      # h = g
-
-        &pxor   ("mm4","mm5");                  # f^=g
-        &pand   ("mm4",$E);                     # f&=e
-        &pxor   ("mm4","mm5");                  # f^=g
-        &paddq  ("mm7","mm4");                  # T1+=Ch(e,f,g)
-
-        &movq   ("mm2",&QWP($Boff,$W512));      # load b
-        &movq   ("mm3",&QWP($Coff,$W512));      # load c
-        &movq   ($E,&QWP($Doff,$W512));         # e = d
-
-        &paddq  ("mm7","mm6");                  # T1+=h
-        &paddq  ("mm7",&QWP(0,$K512,$kidx,8));  # T1+=K512[i]
-        &paddq  ("mm7",&QWP(0,$W512,$widx,8));  # T1+=W512[i]
-        &paddq  ($E,"mm7");                     # e += T1
-
-        &movq   ("mm4",$A);                     # %mm4 is sliding right
-        &movq   ("mm5",$A);                     # %mm5 is sliding left
-        &psrlq  ("mm4",28);
-        &psllq  ("mm5",25);
-        &movq   ("mm6","mm4");                  # %mm6 is T2
-        &pxor   ("mm6","mm5");
-        &psrlq  ("mm4",6);
-        &psllq  ("mm5",5);
-        &pxor   ("mm6","mm4");
-        &pxor   ("mm6","mm5");
-        &psrlq  ("mm4",5);
-        &psllq  ("mm5",6);
-        &pxor   ("mm6","mm4");
-        &pxor   ("mm6","mm5");                  # T2=Sigma0_512(a)
-
-        &movq   (&QWP($Boff,$W512),$A);         # b = a
-        &movq   (&QWP($Coff,$W512),"mm2");      # c = b
-        &movq   (&QWP($Doff,$W512),"mm3");      # d = c
-
-        &movq   ("mm4",$A);                     # %mm4=a
-        &por    ($A,"mm3");                     # a=a|c
-        &pand   ("mm4","mm3");                  # %mm4=a&c
-        &pand   ($A,"mm2");                     # a=(a|c)&b
-        &por    ("mm4",$A);                     # %mm4=(a&c)|((a|c)&b)
-        &paddq  ("mm6","mm4");                  # T2+=Maj(a,b,c)
-
-        &movq   ($A,"mm7");                     # a=T1
-        &paddq  ($A,"mm6");                     # a+=T2
-}
-
-$func="sha512_block_sse2";
-
-&function_begin_B($func);
-        if (0) {# Caller is expected to check if it's appropriate to
-                # call this routine. Below 3 lines are retained for
-                # debugging purposes...
-                &picmeup("eax","OPENSSL_ia32cap");
-                &bt     (&DWP(0,"eax"),26);
-                &jnc    ("SHA512_Transform");
-        }
-
-        &push   ("ebp");
-        &mov    ("ebp","esp");
-        &push   ("ebx");
-        &push   ("esi");
-        &push   ("edi");
-
-        &mov    ($Widx,&DWP(8,"ebp"));          # A-H state, 1st arg
-        &mov    ($data,&DWP(12,"ebp"));         # input data, 2nd arg
-        &call   (&label("pic_point"));          # make it PIC!
-&set_label("pic_point");
-        &blindpop($K512);
-        &lea    ($K512,&DWP(&label("K512")."-".&label("pic_point"),$K512));
-
-        $W512 = "esp";                  # start using %esp as W512
-        &sub    ($W512,$W512_SZ);
-        &and    ($W512,-16);            # ensure 128-bit alignment
-
-        # make private copy of A-H
-        #     v assume the worst and stick to unaligned load
-        &movdqu ("xmm0",&QWP(0,$Widx));
-        &movdqu ("xmm1",&QWP(16,$Widx));
-        &movdqu ("xmm2",&QWP(32,$Widx));
-        &movdqu ("xmm3",&QWP(48,$Widx));
-
-&align(8);
-&set_label("_chunk_loop");
-
-        &movdqa (&QWP($Aoff,$W512),"xmm0");     # a,b
-        &movdqa (&QWP($Coff,$W512),"xmm1");     # c,d
-        &movdqa (&QWP($Eoff,$W512),"xmm2");     # e,f
-        &movdqa (&QWP($Goff,$W512),"xmm3");     # g,h
-
-        &xor    ($Widx,$Widx);
-
-        &movdq2q($A,"xmm0");                    # load a
-        &movdq2q($E,"xmm2");                    # load e
-
-        # Why aren't loops unrolled? It makes sense to unroll if
-        # execution time for loop body is comparable with branch
-        # penalties and/or if whole data-set resides in register bank.
-        # Neither is case here... Well, it would be possible to
-        # eliminate few store operations, but it would hardly affect
-        # so to say stop-watch performance, as there is a lot of
-        # available memory slots to fill. It will only relieve some
-        # pressure off memory bus...
-
-        # flip input stream byte order...
-        &mov    ("eax",&DWP(0,$data,$Widx,8));
-        &mov    ("ebx",&DWP(4,$data,$Widx,8));
-        &bswap  ("eax");
-        &bswap  ("ebx");
-        &mov    (&DWP(0,$W512,$Widx,8),"ebx");          # W512[i]
-        &mov    (&DWP(4,$W512,$Widx,8),"eax");
-        &mov    (&DWP(128+0,$W512,$Widx,8),"ebx");      # copy of W512[i]
-        &mov    (&DWP(128+4,$W512,$Widx,8),"eax");
-
-&align(8);
-&set_label("_1st_loop");                # 0-15
-        # flip input stream byte order...
-        &mov    ("eax",&DWP(0+8,$data,$Widx,8));
-        &mov    ("ebx",&DWP(4+8,$data,$Widx,8));
-        &bswap  ("eax");
-        &bswap  ("ebx");
-        &mov    (&DWP(0+8,$W512,$Widx,8),"ebx");        # W512[i]
-        &mov    (&DWP(4+8,$W512,$Widx,8),"eax");
-        &mov    (&DWP(128+0+8,$W512,$Widx,8),"ebx");    # copy of W512[i]
-        &mov    (&DWP(128+4+8,$W512,$Widx,8),"eax");
-&set_label("_1st_looplet");
-        &SHA2_ROUND($Widx,$Widx); &inc($Widx);
-
-&cmp    ($Widx,15)
-&jl     (&label("_1st_loop"));
-&je     (&label("_1st_looplet"));       # playing similar trick on 2nd loop
-                                        # does not improve performance...
-
-        $Kidx = "ebx";                  # start using %ebx as Kidx
-        &mov    ($Kidx,$Widx);
-
-&align(8);
-&set_label("_2nd_loop");                # 16-79
-        &and($Widx,0xf);
-
-        # 128-bit fragment! I update W512[i] and W512[i+1] in
-        # parallel:-) Note that I refer to W512[(i&0xf)+N] and not to
-        # W512[(i+N)&0xf]! This is exactly what I maintain the second
-        # copy of W512[16] for...
-        &movdqu ("xmm0",&QWP(8*1,$W512,$Widx,8));       # s0=W512[i+1]
-        &movdqa ("xmm2","xmm0");                # %xmm2 is sliding right
-        &movdqa ("xmm3","xmm0");                # %xmm3 is sliding left
-        &psrlq  ("xmm2",1);
-        &psllq  ("xmm3",56);
-        &movdqa ("xmm0","xmm2");
-        &pxor   ("xmm0","xmm3");
-        &psrlq  ("xmm2",6);
-        &psllq  ("xmm3",7);
-        &pxor   ("xmm0","xmm2");
-        &pxor   ("xmm0","xmm3");
-        &psrlq  ("xmm2",1);
-        &pxor   ("xmm0","xmm2");                # s0 = sigma0_512(s0);
-
-        &movdqa ("xmm1",&QWP(8*14,$W512,$Widx,8));      # s1=W512[i+14]
-        &movdqa ("xmm4","xmm1");                # %xmm4 is sliding right
-        &movdqa ("xmm5","xmm1");                # %xmm5 is sliding left
-        &psrlq  ("xmm4",6);
-        &psllq  ("xmm5",3);
-        &movdqa ("xmm1","xmm4");
-        &pxor   ("xmm1","xmm5");
-        &psrlq  ("xmm4",13);
-        &psllq  ("xmm5",42);
-        &pxor   ("xmm1","xmm4");
-        &pxor   ("xmm1","xmm5");
-        &psrlq  ("xmm4",42);
-        &pxor   ("xmm1","xmm4");                # s1 = sigma1_512(s1);
-
-        #     + have to explictly load W512[i+9] as it's not 128-bit
-        #     v aligned and paddq would throw an exception...
-        &movdqu ("xmm6",&QWP(8*9,$W512,$Widx,8));
-        &paddq  ("xmm0","xmm1");                # s0 += s1
-        &paddq  ("xmm0","xmm6");                # s0 += W512[i+9]
-        &paddq  ("xmm0",&QWP(0,$W512,$Widx,8)); # s0 += W512[i]
-
-        &movdqa (&QWP(0,$W512,$Widx,8),"xmm0");         # W512[i] = s0
-        &movdqa (&QWP(16*8,$W512,$Widx,8),"xmm0");      # copy of W512[i]
-
-        # as the above fragment was 128-bit, we "owe" 2 rounds...
-        &SHA2_ROUND($Kidx,$Widx); &inc($Kidx); &inc($Widx);
-        &SHA2_ROUND($Kidx,$Widx); &inc($Kidx); &inc($Widx);
-
-&cmp    ($Kidx,80);
-&jl     (&label("_2nd_loop"));
-
-        # update A-H state
-        &mov    ($Widx,&DWP(8,"ebp"));          # A-H state, 1st arg
-        &movq   (&QWP($Aoff,$W512),$A);         # write out a
-        &movq   (&QWP($Eoff,$W512),$E);         # write out e
-        &movdqu ("xmm0",&QWP(0,$Widx));
-        &movdqu ("xmm1",&QWP(16,$Widx));
-        &movdqu ("xmm2",&QWP(32,$Widx));
-        &movdqu ("xmm3",&QWP(48,$Widx));
-        &paddq  ("xmm0",&QWP($Aoff,$W512));     # 128-bit additions...
-        &paddq  ("xmm1",&QWP($Coff,$W512));
-        &paddq  ("xmm2",&QWP($Eoff,$W512));
-        &paddq  ("xmm3",&QWP($Goff,$W512));
-        &movdqu (&QWP(0,$Widx),"xmm0");
-        &movdqu (&QWP(16,$Widx),"xmm1");
-        &movdqu (&QWP(32,$Widx),"xmm2");
-        &movdqu (&QWP(48,$Widx),"xmm3");
-
-&add    ($data,16*8);                           # advance input data pointer
-&dec    (&DWP(16,"ebp"));                       # decrement 3rd arg
-&jnz    (&label("_chunk_loop"));
-
-        # epilogue
-        &emms   ();     # required for at least ELF and Win32 ABIs
-        &mov    ("edi",&DWP(-12,"ebp"));
-        &mov    ("esi",&DWP(-8,"ebp"));
-        &mov    ("ebx",&DWP(-4,"ebp"));
-        &leave  ();
-&ret    ();
-
-&align(64);
-&set_label("K512");     # Yes! I keep it in the code segment!
-        &data_word(0xd728ae22,0x428a2f98);      # u64
-        &data_word(0x23ef65cd,0x71374491);      # u64
-        &data_word(0xec4d3b2f,0xb5c0fbcf);      # u64
-        &data_word(0x8189dbbc,0xe9b5dba5);      # u64
-        &data_word(0xf348b538,0x3956c25b);      # u64
-        &data_word(0xb605d019,0x59f111f1);      # u64
-        &data_word(0xaf194f9b,0x923f82a4);      # u64
-        &data_word(0xda6d8118,0xab1c5ed5);      # u64
-        &data_word(0xa3030242,0xd807aa98);      # u64
-        &data_word(0x45706fbe,0x12835b01);      # u64
-        &data_word(0x4ee4b28c,0x243185be);      # u64
-        &data_word(0xd5ffb4e2,0x550c7dc3);      # u64
-        &data_word(0xf27b896f,0x72be5d74);      # u64
-        &data_word(0x3b1696b1,0x80deb1fe);      # u64
-        &data_word(0x25c71235,0x9bdc06a7);      # u64
-        &data_word(0xcf692694,0xc19bf174);      # u64
-        &data_word(0x9ef14ad2,0xe49b69c1);      # u64
-        &data_word(0x384f25e3,0xefbe4786);      # u64
-        &data_word(0x8b8cd5b5,0x0fc19dc6);      # u64
-        &data_word(0x77ac9c65,0x240ca1cc);      # u64
-        &data_word(0x592b0275,0x2de92c6f);      # u64
-        &data_word(0x6ea6e483,0x4a7484aa);      # u64
-        &data_word(0xbd41fbd4,0x5cb0a9dc);      # u64
-        &data_word(0x831153b5,0x76f988da);      # u64
-        &data_word(0xee66dfab,0x983e5152);      # u64
-        &data_word(0x2db43210,0xa831c66d);      # u64
-        &data_word(0x98fb213f,0xb00327c8);      # u64
-        &data_word(0xbeef0ee4,0xbf597fc7);      # u64
-        &data_word(0x3da88fc2,0xc6e00bf3);      # u64
-        &data_word(0x930aa725,0xd5a79147);      # u64
-        &data_word(0xe003826f,0x06ca6351);      # u64
-        &data_word(0x0a0e6e70,0x14292967);      # u64
-        &data_word(0x46d22ffc,0x27b70a85);      # u64
-        &data_word(0x5c26c926,0x2e1b2138);      # u64
-        &data_word(0x5ac42aed,0x4d2c6dfc);      # u64
-        &data_word(0x9d95b3df,0x53380d13);      # u64
-        &data_word(0x8baf63de,0x650a7354);      # u64
-        &data_word(0x3c77b2a8,0x766a0abb);      # u64
-        &data_word(0x47edaee6,0x81c2c92e);      # u64
-        &data_word(0x1482353b,0x92722c85);      # u64
-        &data_word(0x4cf10364,0xa2bfe8a1);      # u64
-        &data_word(0xbc423001,0xa81a664b);      # u64
-        &data_word(0xd0f89791,0xc24b8b70);      # u64
-        &data_word(0x0654be30,0xc76c51a3);      # u64
-        &data_word(0xd6ef5218,0xd192e819);      # u64
-        &data_word(0x5565a910,0xd6990624);      # u64
-        &data_word(0x5771202a,0xf40e3585);      # u64
-        &data_word(0x32bbd1b8,0x106aa070);      # u64
-        &data_word(0xb8d2d0c8,0x19a4c116);      # u64
-        &data_word(0x5141ab53,0x1e376c08);      # u64
-        &data_word(0xdf8eeb99,0x2748774c);      # u64
-        &data_word(0xe19b48a8,0x34b0bcb5);      # u64
-        &data_word(0xc5c95a63,0x391c0cb3);      # u64
-        &data_word(0xe3418acb,0x4ed8aa4a);      # u64
-        &data_word(0x7763e373,0x5b9cca4f);      # u64
-        &data_word(0xd6b2b8a3,0x682e6ff3);      # u64
-        &data_word(0x5defb2fc,0x748f82ee);      # u64
-        &data_word(0x43172f60,0x78a5636f);      # u64
-        &data_word(0xa1f0ab72,0x84c87814);      # u64
-        &data_word(0x1a6439ec,0x8cc70208);      # u64
-        &data_word(0x23631e28,0x90befffa);      # u64
-        &data_word(0xde82bde9,0xa4506ceb);      # u64
-        &data_word(0xb2c67915,0xbef9a3f7);      # u64
-        &data_word(0xe372532b,0xc67178f2);      # u64
-        &data_word(0xea26619c,0xca273ece);      # u64
-        &data_word(0x21c0c207,0xd186b8c7);      # u64
-        &data_word(0xcde0eb1e,0xeada7dd6);      # u64
-        &data_word(0xee6ed178,0xf57d4f7f);      # u64
-        &data_word(0x72176fba,0x06f067aa);      # u64
-        &data_word(0xa2c898a6,0x0a637dc5);      # u64
-        &data_word(0xbef90dae,0x113f9804);      # u64
-        &data_word(0x131c471b,0x1b710b35);      # u64
-        &data_word(0x23047d84,0x28db77f5);      # u64
-        &data_word(0x40c72493,0x32caab7b);      # u64
-        &data_word(0x15c9bebc,0x3c9ebe0a);      # u64
-        &data_word(0x9c100d4c,0x431d67c4);      # u64
-        &data_word(0xcb3e42b6,0x4cc5d4be);      # u64
-        &data_word(0xfc657e2a,0x597f299c);      # u64
-        &data_word(0x3ad6faec,0x5fcb6fab);      # u64
-        &data_word(0x4a475817,0x6c44198c);      # u64
-
-&function_end_B($func);
-
-&asm_finish();
diff --git a/src/lib/libcrypto/sha/sha1s.cpp b/src/lib/libcrypto/sha/sha1s.cpp
deleted file mode 100644
index af23d1e0f2..0000000000
--- a/src/lib/libcrypto/sha/sha1s.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// gettsc.inl
-//
-// gives access to the Pentium's (secret) cycle counter
-//
-// This software was written by Leonard Janke (janke@unixg.ubc.ca)
-// in 1996-7 and is entered, by him, into the public domain.
-
-#if defined(__WATCOMC__)
-void GetTSC(unsigned long&);
-#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
-#elif defined(__GNUC__)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  asm volatile(".byte 15, 49\n\t"
-               : "=eax" (tsc)
-               :
-               : "%edx", "%eax");
-}
-#elif defined(_MSC_VER)
-inline
-void GetTSC(unsigned long& tsc)
-{
-  unsigned long a;
-  __asm _emit 0fh
-  __asm _emit 31h
-  __asm mov a, eax;
-  tsc=a;
-}
-#endif      
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/sha.h>
-
-#define sha1_block_x86 sha1_block_asm_data_order
-extern "C" {
-void sha1_block_x86(SHA_CTX *ctx, unsigned char *buffer,int num);
-}
-
-void main(int argc,char *argv[])
-        {
-        unsigned char buffer[64*256];
-        SHA_CTX ctx;
-        unsigned long s1,s2,e1,e2;
-        unsigned char k[16];
-        unsigned long data[2];
-        unsigned char iv[8];
-        int i,num=0,numm;
-        int j=0;
-
-        if (argc >= 2)
-                num=atoi(argv[1]);
-
-        if (num == 0) num=16;
-        if (num > 250) num=16;
-        numm=num+2;
-#if 0
-        num*=64;
-        numm*=64;
-#endif
-
-        for (j=0; j<6; j++)
-                {
-                for (i=0; i<10; i++) /**/
-                        {
-                        sha1_block_x86(&ctx,buffer,numm);
-                        GetTSC(s1);
-                        sha1_block_x86(&ctx,buffer,numm);
-                        GetTSC(e1);
-                        GetTSC(s2);
-                        sha1_block_x86(&ctx,buffer,num);
-                        GetTSC(e2);
-                        sha1_block_x86(&ctx,buffer,num);
-                        }
-
-                printf("sha1 (%d bytes) %d %d (%.2f)\n",num*64,
-                        e1-s1,e2-s2,(double)((e1-s1)-(e2-s2))/2);
-                }
-        }
-
diff --git a/src/lib/libcrypto/sha/sha256t.c b/src/lib/libcrypto/sha/sha256t.c
new file mode 100644
index 0000000000..6b4a3bd001
--- /dev/null
+++ b/src/lib/libcrypto/sha/sha256t.c
@@ -0,0 +1,147 @@
+/* crypto/sha/sha256t.c */
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
+ * ====================================================================
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <openssl/sha.h>
+#include <openssl/evp.h>
+
+#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA256)
+int main(int argc, char *argv[])
+{
+    printf("No SHA256 support\n");
+    return(0);
+}
+#else
+
+unsigned char app_b1[SHA256_DIGEST_LENGTH] = {
+        0xba,0x78,0x16,0xbf,0x8f,0x01,0xcf,0xea,
+        0x41,0x41,0x40,0xde,0x5d,0xae,0x22,0x23,
+        0xb0,0x03,0x61,0xa3,0x96,0x17,0x7a,0x9c,
+        0xb4,0x10,0xff,0x61,0xf2,0x00,0x15,0xad };
+
+unsigned char app_b2[SHA256_DIGEST_LENGTH] = {
+        0x24,0x8d,0x6a,0x61,0xd2,0x06,0x38,0xb8,
+        0xe5,0xc0,0x26,0x93,0x0c,0x3e,0x60,0x39,
+        0xa3,0x3c,0xe4,0x59,0x64,0xff,0x21,0x67,
+        0xf6,0xec,0xed,0xd4,0x19,0xdb,0x06,0xc1 };
+
+unsigned char app_b3[SHA256_DIGEST_LENGTH] = {
+        0xcd,0xc7,0x6e,0x5c,0x99,0x14,0xfb,0x92,
+        0x81,0xa1,0xc7,0xe2,0x84,0xd7,0x3e,0x67,
+        0xf1,0x80,0x9a,0x48,0xa4,0x97,0x20,0x0e,
+        0x04,0x6d,0x39,0xcc,0xc7,0x11,0x2c,0xd0 };
+
+unsigned char addenum_1[SHA224_DIGEST_LENGTH] = {
+        0x23,0x09,0x7d,0x22,0x34,0x05,0xd8,0x22,
+        0x86,0x42,0xa4,0x77,0xbd,0xa2,0x55,0xb3,
+        0x2a,0xad,0xbc,0xe4,0xbd,0xa0,0xb3,0xf7,
+        0xe3,0x6c,0x9d,0xa7 };
+
+unsigned char addenum_2[SHA224_DIGEST_LENGTH] = {
+        0x75,0x38,0x8b,0x16,0x51,0x27,0x76,0xcc,
+        0x5d,0xba,0x5d,0xa1,0xfd,0x89,0x01,0x50,
+        0xb0,0xc6,0x45,0x5c,0xb4,0xf5,0x8b,0x19,
+        0x52,0x52,0x25,0x25 };
+
+unsigned char addenum_3[SHA224_DIGEST_LENGTH] = {
+        0x20,0x79,0x46,0x55,0x98,0x0c,0x91,0xd8,
+        0xbb,0xb4,0xc1,0xea,0x97,0x61,0x8a,0x4b,
+        0xf0,0x3f,0x42,0x58,0x19,0x48,0xb2,0xee,
+        0x4e,0xe7,0xad,0x67 };
+
+int main (int argc,char **argv)
+{ unsigned char md[SHA256_DIGEST_LENGTH];
+  int           i;
+  EVP_MD_CTX    evp;
+
+    fprintf(stdout,"Testing SHA-256 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha256(),NULL);
+    if (memcmp(md,app_b1,sizeof(app_b1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdbcde""cdefdefg""efghfghi""ghijhijk"
+                "ijkljklm""klmnlmno""mnopnopq",56,md,NULL,EVP_sha256(),NULL);
+    if (memcmp(md,app_b2,sizeof(app_b2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha256(),NULL);
+    for (i=0;i<1000000;i+=160)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<160?1000000-i:160);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,app_b3,sizeof(app_b3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+    fprintf(stdout,"Testing SHA-224 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha224(),NULL);
+    if (memcmp(md,addenum_1,sizeof(addenum_1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdbcde""cdefdefg""efghfghi""ghijhijk"
+                "ijkljklm""klmnlmno""mnopnopq",56,md,NULL,EVP_sha224(),NULL);
+    if (memcmp(md,addenum_2,sizeof(addenum_2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha224(),NULL);
+    for (i=0;i<1000000;i+=64)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<64?1000000-i:64);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,addenum_3,sizeof(addenum_3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+  return 0;
+}
+#endif
diff --git a/src/lib/libcrypto/sha/sha512t.c b/src/lib/libcrypto/sha/sha512t.c
new file mode 100644
index 0000000000..210041d435
--- /dev/null
+++ b/src/lib/libcrypto/sha/sha512t.c
@@ -0,0 +1,184 @@
+/* crypto/sha/sha512t.c */
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
+ * ====================================================================
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <openssl/sha.h>
+#include <openssl/evp.h>
+#include <openssl/crypto.h>
+
+#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA512)
+int main(int argc, char *argv[])
+{
+    printf("No SHA512 support\n");
+    return(0);
+}
+#else
+
+unsigned char app_c1[SHA512_DIGEST_LENGTH] = {
+        0xdd,0xaf,0x35,0xa1,0x93,0x61,0x7a,0xba,
+        0xcc,0x41,0x73,0x49,0xae,0x20,0x41,0x31,
+        0x12,0xe6,0xfa,0x4e,0x89,0xa9,0x7e,0xa2,
+        0x0a,0x9e,0xee,0xe6,0x4b,0x55,0xd3,0x9a,
+        0x21,0x92,0x99,0x2a,0x27,0x4f,0xc1,0xa8,
+        0x36,0xba,0x3c,0x23,0xa3,0xfe,0xeb,0xbd,
+        0x45,0x4d,0x44,0x23,0x64,0x3c,0xe8,0x0e,
+        0x2a,0x9a,0xc9,0x4f,0xa5,0x4c,0xa4,0x9f };
+
+unsigned char app_c2[SHA512_DIGEST_LENGTH] = {
+        0x8e,0x95,0x9b,0x75,0xda,0xe3,0x13,0xda,
+        0x8c,0xf4,0xf7,0x28,0x14,0xfc,0x14,0x3f,
+        0x8f,0x77,0x79,0xc6,0xeb,0x9f,0x7f,0xa1,
+        0x72,0x99,0xae,0xad,0xb6,0x88,0x90,0x18,
+        0x50,0x1d,0x28,0x9e,0x49,0x00,0xf7,0xe4,
+        0x33,0x1b,0x99,0xde,0xc4,0xb5,0x43,0x3a,
+        0xc7,0xd3,0x29,0xee,0xb6,0xdd,0x26,0x54,
+        0x5e,0x96,0xe5,0x5b,0x87,0x4b,0xe9,0x09 };
+
+unsigned char app_c3[SHA512_DIGEST_LENGTH] = {
+        0xe7,0x18,0x48,0x3d,0x0c,0xe7,0x69,0x64,
+        0x4e,0x2e,0x42,0xc7,0xbc,0x15,0xb4,0x63,
+        0x8e,0x1f,0x98,0xb1,0x3b,0x20,0x44,0x28,
+        0x56,0x32,0xa8,0x03,0xaf,0xa9,0x73,0xeb,
+        0xde,0x0f,0xf2,0x44,0x87,0x7e,0xa6,0x0a,
+        0x4c,0xb0,0x43,0x2c,0xe5,0x77,0xc3,0x1b,
+        0xeb,0x00,0x9c,0x5c,0x2c,0x49,0xaa,0x2e,
+        0x4e,0xad,0xb2,0x17,0xad,0x8c,0xc0,0x9b };
+
+unsigned char app_d1[SHA384_DIGEST_LENGTH] = {
+        0xcb,0x00,0x75,0x3f,0x45,0xa3,0x5e,0x8b,
+        0xb5,0xa0,0x3d,0x69,0x9a,0xc6,0x50,0x07,
+        0x27,0x2c,0x32,0xab,0x0e,0xde,0xd1,0x63,
+        0x1a,0x8b,0x60,0x5a,0x43,0xff,0x5b,0xed,
+        0x80,0x86,0x07,0x2b,0xa1,0xe7,0xcc,0x23,
+        0x58,0xba,0xec,0xa1,0x34,0xc8,0x25,0xa7 };
+
+unsigned char app_d2[SHA384_DIGEST_LENGTH] = {
+        0x09,0x33,0x0c,0x33,0xf7,0x11,0x47,0xe8,
+        0x3d,0x19,0x2f,0xc7,0x82,0xcd,0x1b,0x47,
+        0x53,0x11,0x1b,0x17,0x3b,0x3b,0x05,0xd2,
+        0x2f,0xa0,0x80,0x86,0xe3,0xb0,0xf7,0x12,
+        0xfc,0xc7,0xc7,0x1a,0x55,0x7e,0x2d,0xb9,
+        0x66,0xc3,0xe9,0xfa,0x91,0x74,0x60,0x39 };
+
+unsigned char app_d3[SHA384_DIGEST_LENGTH] = {
+        0x9d,0x0e,0x18,0x09,0x71,0x64,0x74,0xcb,
+        0x08,0x6e,0x83,0x4e,0x31,0x0a,0x4a,0x1c,
+        0xed,0x14,0x9e,0x9c,0x00,0xf2,0x48,0x52,
+        0x79,0x72,0xce,0xc5,0x70,0x4c,0x2a,0x5b,
+        0x07,0xb8,0xb3,0xdc,0x38,0xec,0xc4,0xeb,
+        0xae,0x97,0xdd,0xd8,0x7f,0x3d,0x89,0x85 };
+
+int main (int argc,char **argv)
+{ unsigned char md[SHA512_DIGEST_LENGTH];
+  int           i;
+  EVP_MD_CTX    evp;
+
+#ifdef OPENSSL_IA32_SSE2
+    /* Alternative to this is to call OpenSSL_add_all_algorithms...
+     * The below code is retained exclusively for debugging purposes. */
+    { char      *env;
+
+        if ((env=getenv("OPENSSL_ia32cap")))
+            OPENSSL_ia32cap = strtoul (env,NULL,0);
+    }
+#endif
+
+    fprintf(stdout,"Testing SHA-512 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha512(),NULL);
+    if (memcmp(md,app_c1,sizeof(app_c1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdefgh""bcdefghi""cdefghij""defghijk"
+                "efghijkl""fghijklm""ghijklmn""hijklmno"
+                "ijklmnop""jklmnopq""klmnopqr""lmnopqrs"
+                "mnopqrst""nopqrstu",112,md,NULL,EVP_sha512(),NULL);
+    if (memcmp(md,app_c2,sizeof(app_c2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha512(),NULL);
+    for (i=0;i<1000000;i+=288)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<288?1000000-i:288);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,app_c3,sizeof(app_c3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+    fprintf(stdout,"Testing SHA-384 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha384(),NULL);
+    if (memcmp(md,app_d1,sizeof(app_d1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdefgh""bcdefghi""cdefghij""defghijk"
+                "efghijkl""fghijklm""ghijklmn""hijklmno"
+                "ijklmnop""jklmnopq""klmnopqr""lmnopqrs"
+                "mnopqrst""nopqrstu",112,md,NULL,EVP_sha384(),NULL);
+    if (memcmp(md,app_d2,sizeof(app_d2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha384(),NULL);
+    for (i=0;i<1000000;i+=64)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<64?1000000-i:64);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,app_d3,sizeof(app_d3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+  return 0;
+}
+#endif
diff --git a/src/lib/libcrypto/store/Makefile b/src/lib/libcrypto/store/Makefile
new file mode 100644
index 0000000000..0dcfd7857a
--- /dev/null
+++ b/src/lib/libcrypto/store/Makefile
@@ -0,0 +1,112 @@
+#
+# OpenSSL/crypto/store/Makefile
+#
+
+DIR=    store
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+#TEST= storetest.c
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= str_err.c str_lib.c str_meth.c str_mem.c
+LIBOBJ= str_err.o str_lib.o str_meth.o str_mem.o
+
+SRC= $(LIBSRC)
+
+#EXHEADER= store.h str_compat.h
+EXHEADER= store.h
+HEADER= $(EXHEADER) str_locl.h
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+str_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+str_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+str_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+str_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+str_err.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_err.o: str_err.c
+str_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+str_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+str_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+str_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+str_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+str_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+str_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+str_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+str_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+str_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+str_lib.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+str_lib.o: str_lib.c str_locl.h
+str_mem.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+str_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+str_mem.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+str_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_mem.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+str_mem.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_mem.o: str_locl.h str_mem.c
+str_meth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+str_meth.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+str_meth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_meth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+str_meth.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_meth.o: str_locl.h str_meth.c
diff --git a/src/lib/libcrypto/store/README b/src/lib/libcrypto/store/README
new file mode 100644
index 0000000000..966168f6a5
--- /dev/null
+++ b/src/lib/libcrypto/store/README
@@ -0,0 +1,95 @@
+The STORE type
+==============
+
+A STORE, as defined in this code section, is really a rather simple
+thing which stores objects and per-object associations to a number
+of attributes.  What attributes are supported entirely depends on
+the particular implementation of a STORE.  It has some support for
+generation of certain objects (for example, keys and CRLs).
+
+
+Supported object types
+----------------------
+
+For now, the objects that are supported are the following:
+
+X.509 certificate
+X.509 CRL
+private key
+public key
+number
+arbitrary (application) data
+
+The intention is that a STORE should be able to store everything
+needed by an application that wants a cert/key store, as well as
+the data a CA might need to store (this includes the serial number
+counter, which explains the support for numbers).
+
+
+Supported attribute types
+-------------------------
+
+For now, the following attributes are supported:
+
+Friendly Name           - the value is a normal C string
+Key ID                  - the value is a 160 bit SHA1 hash
+Issuer Key ID           - the value is a 160 bit SHA1 hash
+Subject Key ID          - the value is a 160 bit SHA1 hash
+Issuer/Serial Hash      - the value is a 160 bit SHA1 hash
+Issuer                  - the value is a X509_NAME
+Serial                  - the value is a BIGNUM
+Subject                 - the value is a X509_NAME
+Certificate Hash        - the value is a 160 bit SHA1 hash
+Email                   - the value is a normal C string
+Filename                - the value is a normal C string
+
+It is expected that these attributes should be enough to support
+the need from most, if not all, current applications.  Applications
+that need to do certificate verification would typically use Subject
+Key ID, Issuer/Serial Hash or Subject to look up issuer certificates.
+S/MIME applications would typically use Email to look up recipient
+and signer certificates.
+
+There's added support for combined sets of attributes to search for,
+with the special OR attribute.
+
+
+Supported basic functionality
+-----------------------------
+
+The functions that are supported through the STORE type are these:
+
+generate_object         - for example to generate keys and CRLs
+get_object              - to look up one object
+                          NOTE: this function is really rather
+                          redundant and probably of lesser usage
+                          than the list functions
+store_object            - store an object and the attributes
+                          associated with it
+modify_object           - modify the attributes associated with
+                          a specific object
+revoke_object           - revoke an object
+                          NOTE: this only marks an object as
+                          invalid, it doesn't remove the object
+                          from the database
+delete_object           - remove an object from the database
+list_object             - list objects associated with a given
+                          set of attributes
+                          NOTE: this is really four functions:
+                          list_start, list_next, list_end and
+                          list_endp
+update_store            - update the internal data of the store
+lock_store              - lock the store
+unlock_store            - unlock the store
+
+The list functions need some extra explanation: list_start is
+used to set up a lookup.  That's where the attributes to use in
+the search are set up.  It returns a search context.  list_next
+returns the next object searched for.  list_end closes the search.
+list_endp is used to check if we have reached the end.
+
+A few words on the store functions as well: update_store is
+typically used by a CA application to update the internal
+structure of a database.  This may for example involve automatic
+removal of expired certificates.  lock_store and unlock_store
+are used for locking a store to allow exclusive writes.
diff --git a/src/lib/libcrypto/store/store.h b/src/lib/libcrypto/store/store.h
new file mode 100644
index 0000000000..0a28c7d5a2
--- /dev/null
+++ b/src/lib/libcrypto/store/store.h
@@ -0,0 +1,561 @@
+/* crypto/store/store.h -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_STORE_H
+#define HEADER_STORE_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_STORE
+#error STORE is disabled.
+#endif
+
+#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#include <openssl/x509.h>
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Already defined in ossl_typ.h */
+/* typedef struct store_st STORE; */
+/* typedef struct store_method_st STORE_METHOD; */
+
+
+/* All the following functions return 0, a negative number or NULL on error.
+   When everything is fine, they return a positive value or a non-NULL
+   pointer, all depending on their purpose. */
+
+/* Creators and destructor.   */
+STORE *STORE_new_method(const STORE_METHOD *method);
+STORE *STORE_new_engine(ENGINE *engine);
+void STORE_free(STORE *ui);
+
+
+/* Give a user interface parametrised control commands.  This can be used to
+   send down an integer, a data pointer or a function pointer, as well as
+   be used to get information from a STORE. */
+int STORE_ctrl(STORE *store, int cmd, long i, void *p, void (*f)(void));
+
+/* A control to set the directory with keys and certificates.  Used by the
+   built-in directory level method. */
+#define STORE_CTRL_SET_DIRECTORY        0x0001
+/* A control to set a file to load.  Used by the built-in file level method. */
+#define STORE_CTRL_SET_FILE             0x0002
+/* A control to set a configuration file to load.  Can be used by any method
+   that wishes to load a configuration file. */
+#define STORE_CTRL_SET_CONF_FILE        0x0003
+/* A control to set a the section of the loaded configuration file.  Can be
+   used by any method that wishes to load a configuration file. */
+#define STORE_CTRL_SET_CONF_SECTION     0x0004
+
+
+/* Some methods may use extra data */
+#define STORE_set_app_data(s,arg)       STORE_set_ex_data(s,0,arg)
+#define STORE_get_app_data(s)           STORE_get_ex_data(s,0)
+int STORE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int STORE_set_ex_data(STORE *r,int idx,void *arg);
+void *STORE_get_ex_data(STORE *r, int idx);
+
+/* Use specific methods instead of the built-in one */
+const STORE_METHOD *STORE_get_method(STORE *store);
+const STORE_METHOD *STORE_set_method(STORE *store, const STORE_METHOD *meth);
+
+/* The standard OpenSSL methods. */
+/* This is the in-memory method.  It does everything except revoking and updating,
+   and is of course volatile.  It's used by other methods that have an in-memory
+   cache. */
+const STORE_METHOD *STORE_Memory(void);
+#if 0 /* Not yet implemented */
+/* This is the directory store.  It does everything except revoking and updating,
+   and uses STORE_Memory() to cache things in memory. */
+const STORE_METHOD *STORE_Directory(void);
+/* This is the file store.  It does everything except revoking and updating,
+   and uses STORE_Memory() to cache things in memory.  Certificates are added
+   to it with the store operation, and it will only get cached certificates. */
+const STORE_METHOD *STORE_File(void);
+#endif
+
+/* Store functions take a type code for the type of data they should store
+   or fetch */
+typedef enum STORE_object_types
+        {
+        STORE_OBJECT_TYPE_X509_CERTIFICATE=     0x01, /* X509 * */
+        STORE_OBJECT_TYPE_X509_CRL=             0x02, /* X509_CRL * */
+        STORE_OBJECT_TYPE_PRIVATE_KEY=          0x03, /* EVP_PKEY * */
+        STORE_OBJECT_TYPE_PUBLIC_KEY=           0x04, /* EVP_PKEY * */
+        STORE_OBJECT_TYPE_NUMBER=               0x05, /* BIGNUM * */
+        STORE_OBJECT_TYPE_ARBITRARY=            0x06, /* BUF_MEM * */
+        STORE_OBJECT_TYPE_NUM=                  0x06  /* The amount of known
+                                                         object types */
+        } STORE_OBJECT_TYPES;
+/* List of text strings corresponding to the object types. */
+extern const char * const STORE_object_type_string[STORE_OBJECT_TYPE_NUM+1];
+
+/* Some store functions take a parameter list.  Those parameters come with
+   one of the following codes. The comments following the codes below indicate
+   what type the value should be a pointer to. */
+typedef enum STORE_params
+        {
+        STORE_PARAM_EVP_TYPE=                   0x01, /* int */
+        STORE_PARAM_BITS=                       0x02, /* size_t */
+        STORE_PARAM_KEY_PARAMETERS=             0x03, /* ??? */
+        STORE_PARAM_KEY_NO_PARAMETERS=          0x04, /* N/A */
+        STORE_PARAM_AUTH_PASSPHRASE=            0x05, /* char * */
+        STORE_PARAM_AUTH_KRB5_TICKET=           0x06, /* void * */
+        STORE_PARAM_TYPE_NUM=                   0x06  /* The amount of known
+                                                         parameter types */
+        } STORE_PARAM_TYPES;
+/* Parameter value sizes.  -1 means unknown, anything else is the required size. */
+extern const int STORE_param_sizes[STORE_PARAM_TYPE_NUM+1];
+
+/* Store functions take attribute lists.  Those attributes come with codes.
+   The comments following the codes below indicate what type the value should
+   be a pointer to. */
+typedef enum STORE_attribs
+        {
+        STORE_ATTR_END=                         0x00,
+        STORE_ATTR_FRIENDLYNAME=                0x01, /* C string */
+        STORE_ATTR_KEYID=                       0x02, /* 160 bit string (SHA1) */
+        STORE_ATTR_ISSUERKEYID=                 0x03, /* 160 bit string (SHA1) */
+        STORE_ATTR_SUBJECTKEYID=                0x04, /* 160 bit string (SHA1) */
+        STORE_ATTR_ISSUERSERIALHASH=            0x05, /* 160 bit string (SHA1) */
+        STORE_ATTR_ISSUER=                      0x06, /* X509_NAME * */
+        STORE_ATTR_SERIAL=                      0x07, /* BIGNUM * */
+        STORE_ATTR_SUBJECT=                     0x08, /* X509_NAME * */
+        STORE_ATTR_CERTHASH=                    0x09, /* 160 bit string (SHA1) */
+        STORE_ATTR_EMAIL=                       0x0a, /* C string */
+        STORE_ATTR_FILENAME=                    0x0b, /* C string */
+        STORE_ATTR_TYPE_NUM=                    0x0b, /* The amount of known
+                                                         attribute types */
+        STORE_ATTR_OR=                          0xff  /* This is a special
+                                                         separator, which
+                                                         expresses the OR
+                                                         operation.  */
+        } STORE_ATTR_TYPES;
+/* Attribute value sizes.  -1 means unknown, anything else is the required size. */
+extern const int STORE_attr_sizes[STORE_ATTR_TYPE_NUM+1];
+
+typedef enum STORE_certificate_status
+        {
+        STORE_X509_VALID=                       0x00,
+        STORE_X509_EXPIRED=                     0x01,
+        STORE_X509_SUSPENDED=                   0x02,
+        STORE_X509_REVOKED=                     0x03
+        } STORE_CERTIFICATE_STATUS;
+
+/* Engine store functions will return a structure that contains all the necessary
+ * information, including revokation status for certificates.  This is really not
+ * needed for application authors, as the ENGINE framework functions will extract
+ * the OpenSSL-specific information when at all possible.  However, for engine
+ * authors, it's crucial to know this structure.  */
+typedef struct STORE_OBJECT_st
+        {
+        STORE_OBJECT_TYPES type;
+        union
+                {
+                struct
+                        {
+                        STORE_CERTIFICATE_STATUS status;
+                        X509 *certificate;
+                        } x509;
+                X509_CRL *crl;
+                EVP_PKEY *key;
+                BIGNUM *number;
+                BUF_MEM *arbitrary;
+                } data;
+        } STORE_OBJECT;
+DECLARE_STACK_OF(STORE_OBJECT)
+STORE_OBJECT *STORE_OBJECT_new(void);
+void STORE_OBJECT_free(STORE_OBJECT *data);
+
+
+
+/* The following functions handle the storage. They return 0, a negative number
+   or NULL on error, anything else on success. */
+X509 *STORE_get_certificate(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_certificate(STORE *e, X509 *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_certificate(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_revoke_certificate(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_certificate(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_certificate_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+X509 *STORE_list_certificate_next(STORE *e, void *handle);
+int STORE_list_certificate_end(STORE *e, void *handle);
+int STORE_list_certificate_endp(STORE *e, void *handle);
+EVP_PKEY *STORE_generate_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+EVP_PKEY *STORE_get_private_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_private_key(STORE *e, EVP_PKEY *data,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+int STORE_modify_private_key(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_revoke_private_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_private_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_private_key_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+EVP_PKEY *STORE_list_private_key_next(STORE *e, void *handle);
+int STORE_list_private_key_end(STORE *e, void *handle);
+int STORE_list_private_key_endp(STORE *e, void *handle);
+EVP_PKEY *STORE_get_public_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_public_key(STORE *e, EVP_PKEY *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_public_key(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_revoke_public_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_public_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_public_key_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+EVP_PKEY *STORE_list_public_key_next(STORE *e, void *handle);
+int STORE_list_public_key_end(STORE *e, void *handle);
+int STORE_list_public_key_endp(STORE *e, void *handle);
+X509_CRL *STORE_generate_crl(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+X509_CRL *STORE_get_crl(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_crl(STORE *e, X509_CRL *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_crl(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_delete_crl(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_crl_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+X509_CRL *STORE_list_crl_next(STORE *e, void *handle);
+int STORE_list_crl_end(STORE *e, void *handle);
+int STORE_list_crl_endp(STORE *e, void *handle);
+int STORE_store_number(STORE *e, BIGNUM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_number(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+BIGNUM *STORE_get_number(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_number(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_arbitrary(STORE *e, BUF_MEM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_arbitrary(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+BUF_MEM *STORE_get_arbitrary(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_arbitrary(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+
+
+/* Create and manipulate methods */
+STORE_METHOD *STORE_create_method(char *name);
+void STORE_destroy_method(STORE_METHOD *store_method);
+
+/* These callback types are use for store handlers */
+typedef int (*STORE_INITIALISE_FUNC_PTR)(STORE *);
+typedef void (*STORE_CLEANUP_FUNC_PTR)(STORE *);
+typedef STORE_OBJECT *(*STORE_GENERATE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef STORE_OBJECT *(*STORE_GET_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef void *(*STORE_START_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef STORE_OBJECT *(*STORE_NEXT_OBJECT_FUNC_PTR)(STORE *, void *handle);
+typedef int (*STORE_END_OBJECT_FUNC_PTR)(STORE *, void *handle);
+typedef int (*STORE_HANDLE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_STORE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, STORE_OBJECT *data, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_MODIFY_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM search_attributes[], OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[], OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_GENERIC_FUNC_PTR)(STORE *, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_CTRL_FUNC_PTR)(STORE *, int cmd, long l, void *p, void (*f)(void));
+
+int STORE_method_set_initialise_function(STORE_METHOD *sm, STORE_INITIALISE_FUNC_PTR init_f);
+int STORE_method_set_cleanup_function(STORE_METHOD *sm, STORE_CLEANUP_FUNC_PTR clean_f);
+int STORE_method_set_generate_function(STORE_METHOD *sm, STORE_GENERATE_OBJECT_FUNC_PTR generate_f);
+int STORE_method_set_get_function(STORE_METHOD *sm, STORE_GET_OBJECT_FUNC_PTR get_f);
+int STORE_method_set_store_function(STORE_METHOD *sm, STORE_STORE_OBJECT_FUNC_PTR store_f);
+int STORE_method_set_modify_function(STORE_METHOD *sm, STORE_MODIFY_OBJECT_FUNC_PTR store_f);
+int STORE_method_set_revoke_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR revoke_f);
+int STORE_method_set_delete_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR delete_f);
+int STORE_method_set_list_start_function(STORE_METHOD *sm, STORE_START_OBJECT_FUNC_PTR list_start_f);
+int STORE_method_set_list_next_function(STORE_METHOD *sm, STORE_NEXT_OBJECT_FUNC_PTR list_next_f);
+int STORE_method_set_list_end_function(STORE_METHOD *sm, STORE_END_OBJECT_FUNC_PTR list_end_f);
+int STORE_method_set_update_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR);
+int STORE_method_set_lock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR);
+int STORE_method_set_unlock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR);
+int STORE_method_set_ctrl_function(STORE_METHOD *sm, STORE_CTRL_FUNC_PTR ctrl_f);
+
+STORE_INITIALISE_FUNC_PTR STORE_method_get_initialise_function(STORE_METHOD *sm);
+STORE_CLEANUP_FUNC_PTR STORE_method_get_cleanup_function(STORE_METHOD *sm);
+STORE_GENERATE_OBJECT_FUNC_PTR STORE_method_get_generate_function(STORE_METHOD *sm);
+STORE_GET_OBJECT_FUNC_PTR STORE_method_get_get_function(STORE_METHOD *sm);
+STORE_STORE_OBJECT_FUNC_PTR STORE_method_get_store_function(STORE_METHOD *sm);
+STORE_MODIFY_OBJECT_FUNC_PTR STORE_method_get_modify_function(STORE_METHOD *sm);
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_revoke_function(STORE_METHOD *sm);
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_delete_function(STORE_METHOD *sm);
+STORE_START_OBJECT_FUNC_PTR STORE_method_get_list_start_function(STORE_METHOD *sm);
+STORE_NEXT_OBJECT_FUNC_PTR STORE_method_get_list_next_function(STORE_METHOD *sm);
+STORE_END_OBJECT_FUNC_PTR STORE_method_get_list_end_function(STORE_METHOD *sm);
+STORE_GENERIC_FUNC_PTR STORE_method_get_update_store_function(STORE_METHOD *sm);
+STORE_GENERIC_FUNC_PTR STORE_method_get_lock_store_function(STORE_METHOD *sm);
+STORE_GENERIC_FUNC_PTR STORE_method_get_unlock_store_function(STORE_METHOD *sm);
+STORE_CTRL_FUNC_PTR STORE_method_get_ctrl_function(STORE_METHOD *sm);
+
+/* Method helper structures and functions. */
+
+/* This structure is the result of parsing through the information in a list
+   of OPENSSL_ITEMs.  It stores all the necessary information in a structured
+   way.*/
+typedef struct STORE_attr_info_st STORE_ATTR_INFO;
+
+/* Parse a list of OPENSSL_ITEMs and return a pointer to a STORE_ATTR_INFO.
+   Note that we do this in the list form, since the list of OPENSSL_ITEMs can
+   come in blocks separated with STORE_ATTR_OR.  Note that the value returned
+   by STORE_parse_attrs_next() must be freed with STORE_ATTR_INFO_free(). */
+void *STORE_parse_attrs_start(OPENSSL_ITEM *attributes);
+STORE_ATTR_INFO *STORE_parse_attrs_next(void *handle);
+int STORE_parse_attrs_end(void *handle);
+int STORE_parse_attrs_endp(void *handle);
+
+/* Creator and destructor */
+STORE_ATTR_INFO *STORE_ATTR_INFO_new(void);
+int STORE_ATTR_INFO_free(STORE_ATTR_INFO *attrs);
+
+/* Manipulators */
+char *STORE_ATTR_INFO_get0_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code);
+unsigned char *STORE_ATTR_INFO_get0_sha1str(STORE_ATTR_INFO *attrs,
+        STORE_ATTR_TYPES code);
+X509_NAME *STORE_ATTR_INFO_get0_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code);
+BIGNUM *STORE_ATTR_INFO_get0_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code);
+int STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size);
+int STORE_ATTR_INFO_set_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size);
+int STORE_ATTR_INFO_set_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn);
+int STORE_ATTR_INFO_set_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number);
+int STORE_ATTR_INFO_modify_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size);
+int STORE_ATTR_INFO_modify_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size);
+int STORE_ATTR_INFO_modify_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn);
+int STORE_ATTR_INFO_modify_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number);
+
+/* Compare on basis of a bit pattern formed by the STORE_ATTR_TYPES values
+   in each contained attribute. */
+int STORE_ATTR_INFO_compare(const STORE_ATTR_INFO * const *a,
+                            const STORE_ATTR_INFO * const *b);
+/* Check if the set of attributes in a is within the range of attributes
+   set in b. */
+int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b);
+/* Check if the set of attributes in a are also set in b. */
+int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b);
+/* Same as STORE_ATTR_INFO_in(), but also checks the attribute values. */
+int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b);
+
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+void ERR_load_STORE_strings(void);
+
+/* Error codes for the STORE functions. */
+
+/* Function codes. */
+#define STORE_F_MEM_DELETE                               134
+#define STORE_F_MEM_GENERATE                             135
+#define STORE_F_MEM_LIST_END                             168
+#define STORE_F_MEM_LIST_NEXT                            136
+#define STORE_F_MEM_LIST_START                           137
+#define STORE_F_MEM_MODIFY                               169
+#define STORE_F_MEM_STORE                                138
+#define STORE_F_STORE_ATTR_INFO_GET0_CSTR                139
+#define STORE_F_STORE_ATTR_INFO_GET0_DN                  140
+#define STORE_F_STORE_ATTR_INFO_GET0_NUMBER              141
+#define STORE_F_STORE_ATTR_INFO_GET0_SHA1STR             142
+#define STORE_F_STORE_ATTR_INFO_MODIFY_CSTR              143
+#define STORE_F_STORE_ATTR_INFO_MODIFY_DN                144
+#define STORE_F_STORE_ATTR_INFO_MODIFY_NUMBER            145
+#define STORE_F_STORE_ATTR_INFO_MODIFY_SHA1STR           146
+#define STORE_F_STORE_ATTR_INFO_SET_CSTR                 147
+#define STORE_F_STORE_ATTR_INFO_SET_DN                   148
+#define STORE_F_STORE_ATTR_INFO_SET_NUMBER               149
+#define STORE_F_STORE_ATTR_INFO_SET_SHA1STR              150
+#define STORE_F_STORE_CERTIFICATE                        170
+#define STORE_F_STORE_CTRL                               161
+#define STORE_F_STORE_DELETE_ARBITRARY                   158
+#define STORE_F_STORE_DELETE_CERTIFICATE                 102
+#define STORE_F_STORE_DELETE_CRL                         103
+#define STORE_F_STORE_DELETE_NUMBER                      104
+#define STORE_F_STORE_DELETE_PRIVATE_KEY                 105
+#define STORE_F_STORE_DELETE_PUBLIC_KEY                  106
+#define STORE_F_STORE_GENERATE_CRL                       107
+#define STORE_F_STORE_GENERATE_KEY                       108
+#define STORE_F_STORE_GET_ARBITRARY                      159
+#define STORE_F_STORE_GET_CERTIFICATE                    109
+#define STORE_F_STORE_GET_CRL                            110
+#define STORE_F_STORE_GET_NUMBER                         111
+#define STORE_F_STORE_GET_PRIVATE_KEY                    112
+#define STORE_F_STORE_GET_PUBLIC_KEY                     113
+#define STORE_F_STORE_LIST_CERTIFICATE_END               114
+#define STORE_F_STORE_LIST_CERTIFICATE_ENDP              153
+#define STORE_F_STORE_LIST_CERTIFICATE_NEXT              115
+#define STORE_F_STORE_LIST_CERTIFICATE_START             116
+#define STORE_F_STORE_LIST_CRL_END                       117
+#define STORE_F_STORE_LIST_CRL_ENDP                      154
+#define STORE_F_STORE_LIST_CRL_NEXT                      118
+#define STORE_F_STORE_LIST_CRL_START                     119
+#define STORE_F_STORE_LIST_PRIVATE_KEY_END               120
+#define STORE_F_STORE_LIST_PRIVATE_KEY_ENDP              155
+#define STORE_F_STORE_LIST_PRIVATE_KEY_NEXT              121
+#define STORE_F_STORE_LIST_PRIVATE_KEY_START             122
+#define STORE_F_STORE_LIST_PUBLIC_KEY_END                123
+#define STORE_F_STORE_LIST_PUBLIC_KEY_ENDP               156
+#define STORE_F_STORE_LIST_PUBLIC_KEY_NEXT               124
+#define STORE_F_STORE_LIST_PUBLIC_KEY_START              125
+#define STORE_F_STORE_MODIFY_ARBITRARY                   162
+#define STORE_F_STORE_MODIFY_CERTIFICATE                 163
+#define STORE_F_STORE_MODIFY_CRL                         164
+#define STORE_F_STORE_MODIFY_NUMBER                      165
+#define STORE_F_STORE_MODIFY_PRIVATE_KEY                 166
+#define STORE_F_STORE_MODIFY_PUBLIC_KEY                  167
+#define STORE_F_STORE_NEW_ENGINE                         133
+#define STORE_F_STORE_NEW_METHOD                         132
+#define STORE_F_STORE_PARSE_ATTRS_END                    151
+#define STORE_F_STORE_PARSE_ATTRS_ENDP                   172
+#define STORE_F_STORE_PARSE_ATTRS_NEXT                   152
+#define STORE_F_STORE_PARSE_ATTRS_START                  171
+#define STORE_F_STORE_REVOKE_CERTIFICATE                 129
+#define STORE_F_STORE_REVOKE_PRIVATE_KEY                 130
+#define STORE_F_STORE_REVOKE_PUBLIC_KEY                  131
+#define STORE_F_STORE_STORE_ARBITRARY                    157
+#define STORE_F_STORE_STORE_CERTIFICATE                  100
+#define STORE_F_STORE_STORE_CRL                          101
+#define STORE_F_STORE_STORE_NUMBER                       126
+#define STORE_F_STORE_STORE_PRIVATE_KEY                  127
+#define STORE_F_STORE_STORE_PUBLIC_KEY                   128
+
+/* Reason codes. */
+#define STORE_R_ALREADY_HAS_A_VALUE                      127
+#define STORE_R_FAILED_DELETING_ARBITRARY                132
+#define STORE_R_FAILED_DELETING_CERTIFICATE              100
+#define STORE_R_FAILED_DELETING_KEY                      101
+#define STORE_R_FAILED_DELETING_NUMBER                   102
+#define STORE_R_FAILED_GENERATING_CRL                    103
+#define STORE_R_FAILED_GENERATING_KEY                    104
+#define STORE_R_FAILED_GETTING_ARBITRARY                 133
+#define STORE_R_FAILED_GETTING_CERTIFICATE               105
+#define STORE_R_FAILED_GETTING_KEY                       106
+#define STORE_R_FAILED_GETTING_NUMBER                    107
+#define STORE_R_FAILED_LISTING_CERTIFICATES              108
+#define STORE_R_FAILED_LISTING_KEYS                      109
+#define STORE_R_FAILED_MODIFYING_ARBITRARY               138
+#define STORE_R_FAILED_MODIFYING_CERTIFICATE             139
+#define STORE_R_FAILED_MODIFYING_CRL                     140
+#define STORE_R_FAILED_MODIFYING_NUMBER                  141
+#define STORE_R_FAILED_MODIFYING_PRIVATE_KEY             142
+#define STORE_R_FAILED_MODIFYING_PUBLIC_KEY              143
+#define STORE_R_FAILED_REVOKING_CERTIFICATE              110
+#define STORE_R_FAILED_REVOKING_KEY                      111
+#define STORE_R_FAILED_STORING_ARBITRARY                 134
+#define STORE_R_FAILED_STORING_CERTIFICATE               112
+#define STORE_R_FAILED_STORING_KEY                       113
+#define STORE_R_FAILED_STORING_NUMBER                    114
+#define STORE_R_NOT_IMPLEMENTED                          128
+#define STORE_R_NO_CONTROL_FUNCTION                      144
+#define STORE_R_NO_DELETE_ARBITRARY_FUNCTION             135
+#define STORE_R_NO_DELETE_NUMBER_FUNCTION                115
+#define STORE_R_NO_DELETE_OBJECT_FUNCTION                116
+#define STORE_R_NO_GENERATE_CRL_FUNCTION                 117
+#define STORE_R_NO_GENERATE_OBJECT_FUNCTION              118
+#define STORE_R_NO_GET_OBJECT_ARBITRARY_FUNCTION         136
+#define STORE_R_NO_GET_OBJECT_FUNCTION                   119
+#define STORE_R_NO_GET_OBJECT_NUMBER_FUNCTION            120
+#define STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION             131
+#define STORE_R_NO_LIST_OBJECT_END_FUNCTION              121
+#define STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION             122
+#define STORE_R_NO_LIST_OBJECT_START_FUNCTION            123
+#define STORE_R_NO_MODIFY_OBJECT_FUNCTION                145
+#define STORE_R_NO_REVOKE_OBJECT_FUNCTION                124
+#define STORE_R_NO_STORE                                 129
+#define STORE_R_NO_STORE_OBJECT_ARBITRARY_FUNCTION       137
+#define STORE_R_NO_STORE_OBJECT_FUNCTION                 125
+#define STORE_R_NO_STORE_OBJECT_NUMBER_FUNCTION          126
+#define STORE_R_NO_VALUE                                 130
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libcrypto/store/str_err.c b/src/lib/libcrypto/store/str_err.c
new file mode 100644
index 0000000000..924edf0505
--- /dev/null
+++ b/src/lib/libcrypto/store/str_err.c
@@ -0,0 +1,211 @@
+/* crypto/store/str_err.c */
+/* ====================================================================
+ * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include <openssl/store.h>
+
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_STORE,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_STORE,0,reason)
+
+static ERR_STRING_DATA STORE_str_functs[]=
+        {
+{ERR_FUNC(STORE_F_MEM_DELETE),  "MEM_DELETE"},
+{ERR_FUNC(STORE_F_MEM_GENERATE),        "MEM_GENERATE"},
+{ERR_FUNC(STORE_F_MEM_LIST_END),        "MEM_LIST_END"},
+{ERR_FUNC(STORE_F_MEM_LIST_NEXT),       "MEM_LIST_NEXT"},
+{ERR_FUNC(STORE_F_MEM_LIST_START),      "MEM_LIST_START"},
+{ERR_FUNC(STORE_F_MEM_MODIFY),  "MEM_MODIFY"},
+{ERR_FUNC(STORE_F_MEM_STORE),   "MEM_STORE"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_CSTR),   "STORE_ATTR_INFO_get0_cstr"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_DN),     "STORE_ATTR_INFO_get0_dn"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_NUMBER), "STORE_ATTR_INFO_get0_number"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_SHA1STR),        "STORE_ATTR_INFO_get0_sha1str"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_CSTR), "STORE_ATTR_INFO_modify_cstr"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_DN),   "STORE_ATTR_INFO_modify_dn"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_NUMBER),       "STORE_ATTR_INFO_modify_number"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_SHA1STR),      "STORE_ATTR_INFO_modify_sha1str"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_CSTR),    "STORE_ATTR_INFO_set_cstr"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_DN),      "STORE_ATTR_INFO_set_dn"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_NUMBER),  "STORE_ATTR_INFO_set_number"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_SHA1STR), "STORE_ATTR_INFO_set_sha1str"},
+{ERR_FUNC(STORE_F_STORE_CERTIFICATE),   "STORE_CERTIFICATE"},
+{ERR_FUNC(STORE_F_STORE_CTRL),  "STORE_ctrl"},
+{ERR_FUNC(STORE_F_STORE_DELETE_ARBITRARY),      "STORE_delete_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_DELETE_CERTIFICATE),    "STORE_delete_certificate"},
+{ERR_FUNC(STORE_F_STORE_DELETE_CRL),    "STORE_delete_crl"},
+{ERR_FUNC(STORE_F_STORE_DELETE_NUMBER), "STORE_delete_number"},
+{ERR_FUNC(STORE_F_STORE_DELETE_PRIVATE_KEY),    "STORE_delete_private_key"},
+{ERR_FUNC(STORE_F_STORE_DELETE_PUBLIC_KEY),     "STORE_delete_public_key"},
+{ERR_FUNC(STORE_F_STORE_GENERATE_CRL),  "STORE_generate_crl"},
+{ERR_FUNC(STORE_F_STORE_GENERATE_KEY),  "STORE_generate_key"},
+{ERR_FUNC(STORE_F_STORE_GET_ARBITRARY), "STORE_get_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_GET_CERTIFICATE),       "STORE_get_certificate"},
+{ERR_FUNC(STORE_F_STORE_GET_CRL),       "STORE_get_crl"},
+{ERR_FUNC(STORE_F_STORE_GET_NUMBER),    "STORE_get_number"},
+{ERR_FUNC(STORE_F_STORE_GET_PRIVATE_KEY),       "STORE_get_private_key"},
+{ERR_FUNC(STORE_F_STORE_GET_PUBLIC_KEY),        "STORE_get_public_key"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_END),  "STORE_list_certificate_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_ENDP), "STORE_list_certificate_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_NEXT), "STORE_list_certificate_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_START),        "STORE_list_certificate_start"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_END),  "STORE_list_crl_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_ENDP), "STORE_list_crl_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_NEXT), "STORE_list_crl_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_START),        "STORE_list_crl_start"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_END),  "STORE_list_private_key_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_ENDP), "STORE_list_private_key_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_NEXT), "STORE_list_private_key_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_START),        "STORE_list_private_key_start"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_END),   "STORE_list_public_key_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_ENDP),  "STORE_list_public_key_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_NEXT),  "STORE_list_public_key_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_START), "STORE_list_public_key_start"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_ARBITRARY),      "STORE_modify_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_CERTIFICATE),    "STORE_modify_certificate"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_CRL),    "STORE_modify_crl"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_NUMBER), "STORE_modify_number"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_PRIVATE_KEY),    "STORE_modify_private_key"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_PUBLIC_KEY),     "STORE_modify_public_key"},
+{ERR_FUNC(STORE_F_STORE_NEW_ENGINE),    "STORE_new_engine"},
+{ERR_FUNC(STORE_F_STORE_NEW_METHOD),    "STORE_new_method"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_END),       "STORE_parse_attrs_end"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_ENDP),      "STORE_parse_attrs_endp"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_NEXT),      "STORE_parse_attrs_next"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_START),     "STORE_parse_attrs_start"},
+{ERR_FUNC(STORE_F_STORE_REVOKE_CERTIFICATE),    "STORE_revoke_certificate"},
+{ERR_FUNC(STORE_F_STORE_REVOKE_PRIVATE_KEY),    "STORE_revoke_private_key"},
+{ERR_FUNC(STORE_F_STORE_REVOKE_PUBLIC_KEY),     "STORE_revoke_public_key"},
+{ERR_FUNC(STORE_F_STORE_STORE_ARBITRARY),       "STORE_store_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_STORE_CERTIFICATE),     "STORE_store_certificate"},
+{ERR_FUNC(STORE_F_STORE_STORE_CRL),     "STORE_store_crl"},
+{ERR_FUNC(STORE_F_STORE_STORE_NUMBER),  "STORE_store_number"},
+{ERR_FUNC(STORE_F_STORE_STORE_PRIVATE_KEY),     "STORE_store_private_key"},
+{ERR_FUNC(STORE_F_STORE_STORE_PUBLIC_KEY),      "STORE_store_public_key"},
+{0,NULL}
+        };
+
+static ERR_STRING_DATA STORE_str_reasons[]=
+        {
+{ERR_REASON(STORE_R_ALREADY_HAS_A_VALUE) ,"already has a value"},
+{ERR_REASON(STORE_R_FAILED_DELETING_ARBITRARY),"failed deleting arbitrary"},
+{ERR_REASON(STORE_R_FAILED_DELETING_CERTIFICATE),"failed deleting certificate"},
+{ERR_REASON(STORE_R_FAILED_DELETING_KEY) ,"failed deleting key"},
+{ERR_REASON(STORE_R_FAILED_DELETING_NUMBER),"failed deleting number"},
+{ERR_REASON(STORE_R_FAILED_GENERATING_CRL),"failed generating crl"},
+{ERR_REASON(STORE_R_FAILED_GENERATING_KEY),"failed generating key"},
+{ERR_REASON(STORE_R_FAILED_GETTING_ARBITRARY),"failed getting arbitrary"},
+{ERR_REASON(STORE_R_FAILED_GETTING_CERTIFICATE),"failed getting certificate"},
+{ERR_REASON(STORE_R_FAILED_GETTING_KEY)  ,"failed getting key"},
+{ERR_REASON(STORE_R_FAILED_GETTING_NUMBER),"failed getting number"},
+{ERR_REASON(STORE_R_FAILED_LISTING_CERTIFICATES),"failed listing certificates"},
+{ERR_REASON(STORE_R_FAILED_LISTING_KEYS) ,"failed listing keys"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_ARBITRARY),"failed modifying arbitrary"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_CERTIFICATE),"failed modifying certificate"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_CRL),"failed modifying crl"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_NUMBER),"failed modifying number"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_PRIVATE_KEY),"failed modifying private key"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_PUBLIC_KEY),"failed modifying public key"},
+{ERR_REASON(STORE_R_FAILED_REVOKING_CERTIFICATE),"failed revoking certificate"},
+{ERR_REASON(STORE_R_FAILED_REVOKING_KEY) ,"failed revoking key"},
+{ERR_REASON(STORE_R_FAILED_STORING_ARBITRARY),"failed storing arbitrary"},
+{ERR_REASON(STORE_R_FAILED_STORING_CERTIFICATE),"failed storing certificate"},
+{ERR_REASON(STORE_R_FAILED_STORING_KEY)  ,"failed storing key"},
+{ERR_REASON(STORE_R_FAILED_STORING_NUMBER),"failed storing number"},
+{ERR_REASON(STORE_R_NOT_IMPLEMENTED)     ,"not implemented"},
+{ERR_REASON(STORE_R_NO_CONTROL_FUNCTION) ,"no control function"},
+{ERR_REASON(STORE_R_NO_DELETE_ARBITRARY_FUNCTION),"no delete arbitrary function"},
+{ERR_REASON(STORE_R_NO_DELETE_NUMBER_FUNCTION),"no delete number function"},
+{ERR_REASON(STORE_R_NO_DELETE_OBJECT_FUNCTION),"no delete object function"},
+{ERR_REASON(STORE_R_NO_GENERATE_CRL_FUNCTION),"no generate crl function"},
+{ERR_REASON(STORE_R_NO_GENERATE_OBJECT_FUNCTION),"no generate object function"},
+{ERR_REASON(STORE_R_NO_GET_OBJECT_ARBITRARY_FUNCTION),"no get object arbitrary function"},
+{ERR_REASON(STORE_R_NO_GET_OBJECT_FUNCTION),"no get object function"},
+{ERR_REASON(STORE_R_NO_GET_OBJECT_NUMBER_FUNCTION),"no get object number function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION),"no list object endp function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_END_FUNCTION),"no list object end function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION),"no list object next function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_START_FUNCTION),"no list object start function"},
+{ERR_REASON(STORE_R_NO_MODIFY_OBJECT_FUNCTION),"no modify object function"},
+{ERR_REASON(STORE_R_NO_REVOKE_OBJECT_FUNCTION),"no revoke object function"},
+{ERR_REASON(STORE_R_NO_STORE)            ,"no store"},
+{ERR_REASON(STORE_R_NO_STORE_OBJECT_ARBITRARY_FUNCTION),"no store object arbitrary function"},
+{ERR_REASON(STORE_R_NO_STORE_OBJECT_FUNCTION),"no store object function"},
+{ERR_REASON(STORE_R_NO_STORE_OBJECT_NUMBER_FUNCTION),"no store object number function"},
+{ERR_REASON(STORE_R_NO_VALUE)            ,"no value"},
+{0,NULL}
+        };
+
+#endif
+
+void ERR_load_STORE_strings(void)
+        {
+#ifndef OPENSSL_NO_ERR
+
+        if (ERR_func_error_string(STORE_str_functs[0].error) == NULL)
+                {
+                ERR_load_strings(0,STORE_str_functs);
+                ERR_load_strings(0,STORE_str_reasons);
+                }
+#endif
+        }
diff --git a/src/lib/libcrypto/store/str_lib.c b/src/lib/libcrypto/store/str_lib.c
new file mode 100644
index 0000000000..f1dbcbd0e0
--- /dev/null
+++ b/src/lib/libcrypto/store/str_lib.c
@@ -0,0 +1,1828 @@
+/* crypto/store/str_lib.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include <openssl/bn.h>
+#include <openssl/err.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/sha.h>
+#include <openssl/x509.h>
+#include "str_locl.h"
+
+const char * const STORE_object_type_string[STORE_OBJECT_TYPE_NUM+1] =
+        {
+        0,
+        "X.509 Certificate",
+        "X.509 CRL",
+        "Private Key",
+        "Public Key",
+        "Number",
+        "Arbitrary Data"
+        };
+
+const int STORE_param_sizes[STORE_PARAM_TYPE_NUM+1] =
+        {
+        0,
+        sizeof(int),            /* EVP_TYPE */
+        sizeof(size_t),         /* BITS */
+        -1,                     /* KEY_PARAMETERS */
+        0                       /* KEY_NO_PARAMETERS */
+        };      
+
+const int STORE_attr_sizes[STORE_ATTR_TYPE_NUM+1] =
+        {
+        0,
+        -1,                     /* FRIENDLYNAME:        C string */
+        SHA_DIGEST_LENGTH,      /* KEYID:               SHA1 digest, 160 bits */
+        SHA_DIGEST_LENGTH,      /* ISSUERKEYID:         SHA1 digest, 160 bits */
+        SHA_DIGEST_LENGTH,      /* SUBJECTKEYID:        SHA1 digest, 160 bits */
+        SHA_DIGEST_LENGTH,      /* ISSUERSERIALHASH:    SHA1 digest, 160 bits */
+        sizeof(X509_NAME *),    /* ISSUER:              X509_NAME * */
+        sizeof(BIGNUM *),       /* SERIAL:              BIGNUM * */
+        sizeof(X509_NAME *),    /* SUBJECT:             X509_NAME * */
+        SHA_DIGEST_LENGTH,      /* CERTHASH:            SHA1 digest, 160 bits */
+        -1,                     /* EMAIL:               C string */
+        -1,                     /* FILENAME:            C string */
+        };      
+
+STORE *STORE_new_method(const STORE_METHOD *method)
+        {
+        STORE *ret;
+
+        if (method == NULL)
+                {
+                STOREerr(STORE_F_STORE_NEW_METHOD,ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+
+        ret=(STORE *)OPENSSL_malloc(sizeof(STORE));
+        if (ret == NULL)
+                {
+                STOREerr(STORE_F_STORE_NEW_METHOD,ERR_R_MALLOC_FAILURE);
+                return NULL;
+                }
+
+        ret->meth=method;
+
+        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_STORE, ret, &ret->ex_data);
+        if (ret->meth->init && !ret->meth->init(ret))
+                {
+                STORE_free(ret);
+                ret = NULL;
+                }
+        return ret;
+        }
+
+STORE *STORE_new_engine(ENGINE *engine)
+        {
+        STORE *ret = NULL;
+        ENGINE *e = engine;
+        const STORE_METHOD *meth = 0;
+
+#ifdef OPENSSL_NO_ENGINE
+        e = NULL;
+#else
+        if (engine)
+                {
+                if (!ENGINE_init(engine))
+                        {
+                        STOREerr(STORE_F_STORE_NEW_ENGINE, ERR_R_ENGINE_LIB);
+                        return NULL;
+                        }
+                e = engine;
+                }
+        else
+                {
+                STOREerr(STORE_F_STORE_NEW_ENGINE,ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if(e)
+                {
+                meth = ENGINE_get_STORE(e);
+                if(!meth)
+                        {
+                        STOREerr(STORE_F_STORE_NEW_ENGINE,
+                                ERR_R_ENGINE_LIB);
+                        ENGINE_finish(e);
+                        return NULL;
+                        }
+                }
+#endif
+
+        ret = STORE_new_method(meth);
+        if (ret == NULL)
+                {
+                STOREerr(STORE_F_STORE_NEW_ENGINE,ERR_R_STORE_LIB);
+                return NULL;
+                }
+
+        ret->engine = e;
+
+        return(ret);
+        }
+
+void STORE_free(STORE *store)
+        {
+        if (store == NULL)
+                return;
+        if (store->meth->clean)
+                store->meth->clean(store);
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_STORE, store, &store->ex_data);
+        OPENSSL_free(store);
+        }
+
+int STORE_ctrl(STORE *store, int cmd, long i, void *p, void (*f)(void))
+        {
+        if (store == NULL)
+                {
+                STOREerr(STORE_F_STORE_CTRL,ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (store->meth->ctrl)
+                return store->meth->ctrl(store, cmd, i, p, f);
+        STOREerr(STORE_F_STORE_CTRL,STORE_R_NO_CONTROL_FUNCTION);
+        return 0;
+        }
+
+
+int STORE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+        {
+        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_STORE, argl, argp,
+                                new_func, dup_func, free_func);
+        }
+
+int STORE_set_ex_data(STORE *r, int idx, void *arg)
+        {
+        return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
+        }
+
+void *STORE_get_ex_data(STORE *r, int idx)
+        {
+        return(CRYPTO_get_ex_data(&r->ex_data,idx));
+        }
+
+const STORE_METHOD *STORE_get_method(STORE *store)
+        {
+        return store->meth;
+        }
+
+const STORE_METHOD *STORE_set_method(STORE *store, const STORE_METHOD *meth)
+        {
+        store->meth=meth;
+        return store->meth;
+        }
+
+
+/* API helpers */
+
+#define check_store(s,fncode,fnname,fnerrcode) \
+        do \
+                { \
+                if ((s) == NULL || (s)->meth == NULL) \
+                        { \
+                        STOREerr((fncode), ERR_R_PASSED_NULL_PARAMETER); \
+                        return 0; \
+                        } \
+                if ((s)->meth->fnname == NULL) \
+                        { \
+                        STOREerr((fncode), (fnerrcode)); \
+                        return 0; \
+                        } \
+                } \
+        while(0)
+
+/* API functions */
+
+X509 *STORE_get_certificate(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        X509 *x;
+
+        check_store(s,STORE_F_STORE_GET_CERTIFICATE,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                attributes, parameters);
+        if (!object || !object->data.x509.certificate)
+                {
+                STOREerr(STORE_F_STORE_GET_CERTIFICATE,
+                        STORE_R_FAILED_GETTING_CERTIFICATE);
+                return 0;
+                }
+        CRYPTO_add(&object->data.x509.certificate->references,1,CRYPTO_LOCK_X509);
+#ifdef REF_PRINT
+        REF_PRINT("X509",data);
+#endif
+        x = object->data.x509.certificate;
+        STORE_OBJECT_free(object);
+        return x;
+        }
+
+int STORE_store_certificate(STORE *s, X509 *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_CERTIFICATE,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_CERTIFICATE,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_X509);
+#ifdef REF_PRINT
+        REF_PRINT("X509",data);
+#endif
+        object->data.x509.certificate = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                object, attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_CERTIFICATE,
+                        STORE_R_FAILED_STORING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_modify_certificate(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_CERTIFICATE,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_CERTIFICATE,
+                        STORE_R_FAILED_MODIFYING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_revoke_certificate(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_REVOKE_CERTIFICATE,
+                revoke_object,STORE_R_NO_REVOKE_OBJECT_FUNCTION);
+
+        if (!s->meth->revoke_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_REVOKE_CERTIFICATE,
+                        STORE_R_FAILED_REVOKING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_delete_certificate(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_CERTIFICATE,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_CERTIFICATE,
+                        STORE_R_FAILED_DELETING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_certificate_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s,
+                STORE_OBJECT_TYPE_X509_CERTIFICATE, attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_START,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        return handle;
+        }
+
+X509 *STORE_list_certificate_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        X509 *x;
+
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.x509.certificate)
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_NEXT,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        CRYPTO_add(&object->data.x509.certificate->references,1,CRYPTO_LOCK_X509);
+#ifdef REF_PRINT
+        REF_PRINT("X509",data);
+#endif
+        x = object->data.x509.certificate;
+        STORE_OBJECT_free(object);
+        return x;
+        }
+
+int STORE_list_certificate_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_END,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_certificate_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_ENDP,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        return 1;
+        }
+
+EVP_PKEY *STORE_generate_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_GENERATE_KEY,
+                generate_object,STORE_R_NO_GENERATE_OBJECT_FUNCTION);
+
+        object = s->meth->generate_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+        if (!object || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_GENERATE_KEY,
+                        STORE_R_FAILED_GENERATING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+EVP_PKEY *STORE_get_private_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_GET_PRIVATE_KEY,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_GET_PRIVATE_KEY,
+                        STORE_R_FAILED_GETTING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_store_private_key(STORE *s, EVP_PKEY *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_PRIVATE_KEY,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_PRIVATE_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        object->data.key = EVP_PKEY_new();
+        if (!object->data.key)
+                {
+                STOREerr(STORE_F_STORE_STORE_PRIVATE_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        object->data.key = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_PRIVATE_KEY,
+                        STORE_R_FAILED_STORING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_modify_private_key(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_PRIVATE_KEY,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_PRIVATE_KEY,
+                        STORE_R_FAILED_MODIFYING_PRIVATE_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_revoke_private_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        int i;
+
+        check_store(s,STORE_F_STORE_REVOKE_PRIVATE_KEY,
+                revoke_object,STORE_R_NO_REVOKE_OBJECT_FUNCTION);
+
+        i = s->meth->revoke_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_REVOKE_PRIVATE_KEY,
+                        STORE_R_FAILED_REVOKING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_delete_private_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_PRIVATE_KEY,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+        
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_PRIVATE_KEY,
+                        STORE_R_FAILED_DELETING_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_private_key_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_START,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return handle;
+        }
+
+EVP_PKEY *STORE_list_private_key_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_NEXT,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_list_private_key_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_END,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_private_key_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_ENDP,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+EVP_PKEY *STORE_get_public_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_GET_PUBLIC_KEY,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                attributes, parameters);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_GET_PUBLIC_KEY,
+                        STORE_R_FAILED_GETTING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_store_public_key(STORE *s, EVP_PKEY *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_PUBLIC_KEY,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_PUBLIC_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        object->data.key = EVP_PKEY_new();
+        if (!object->data.key)
+                {
+                STOREerr(STORE_F_STORE_STORE_PUBLIC_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        object->data.key = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_PUBLIC_KEY,
+                        STORE_R_FAILED_STORING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_modify_public_key(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_PUBLIC_KEY,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_PUBLIC_KEY,
+                        STORE_R_FAILED_MODIFYING_PUBLIC_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_revoke_public_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        int i;
+
+        check_store(s,STORE_F_STORE_REVOKE_PUBLIC_KEY,
+                revoke_object,STORE_R_NO_REVOKE_OBJECT_FUNCTION);
+
+        i = s->meth->revoke_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                attributes, parameters);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_REVOKE_PUBLIC_KEY,
+                        STORE_R_FAILED_REVOKING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_delete_public_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_PUBLIC_KEY,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+        
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_PUBLIC_KEY,
+                        STORE_R_FAILED_DELETING_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_public_key_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_START,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return handle;
+        }
+
+EVP_PKEY *STORE_list_public_key_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_NEXT,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_list_public_key_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_END,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_public_key_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_ENDP,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+X509_CRL *STORE_generate_crl(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        X509_CRL *crl;
+
+        check_store(s,STORE_F_STORE_GENERATE_CRL,
+                generate_object,STORE_R_NO_GENERATE_CRL_FUNCTION);
+
+        object = s->meth->generate_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                attributes, parameters);
+        if (!object || !object->data.crl)
+                {
+                STOREerr(STORE_F_STORE_GENERATE_CRL,
+                        STORE_R_FAILED_GENERATING_CRL);
+                return 0;
+                }
+        CRYPTO_add(&object->data.crl->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        crl = object->data.crl;
+        STORE_OBJECT_free(object);
+        return crl;
+        }
+
+X509_CRL *STORE_get_crl(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        X509_CRL *crl;
+
+        check_store(s,STORE_F_STORE_GET_CRL,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                attributes, parameters);
+        if (!object || !object->data.crl)
+                {
+                STOREerr(STORE_F_STORE_GET_CRL,
+                        STORE_R_FAILED_GETTING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.crl->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        crl = object->data.crl;
+        STORE_OBJECT_free(object);
+        return crl;
+        }
+
+int STORE_store_crl(STORE *s, X509_CRL *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_CRL,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_CRL,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        object->data.crl = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_X509_CRL, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_CRL,
+                        STORE_R_FAILED_STORING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_modify_crl(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_CRL,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_CRL,
+                        STORE_R_FAILED_MODIFYING_CRL);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_delete_crl(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_CRL,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+        
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_CRL,
+                        STORE_R_FAILED_DELETING_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_crl_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_CRL_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s, STORE_OBJECT_TYPE_X509_CRL,
+                attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_START,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return handle;
+        }
+
+X509_CRL *STORE_list_crl_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        X509_CRL *crl;
+
+        check_store(s,STORE_F_STORE_LIST_CRL_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.crl)
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_NEXT,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        CRYPTO_add(&object->data.crl->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        crl = object->data.crl;
+        STORE_OBJECT_free(object);
+        return crl;
+        }
+
+int STORE_list_crl_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CRL_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_END,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_crl_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CRL_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_ENDP,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_store_number(STORE *s, BIGNUM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_NUMBER,
+                store_object,STORE_R_NO_STORE_OBJECT_NUMBER_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_NUMBER,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        object->data.number = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_NUMBER, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_NUMBER,
+                        STORE_R_FAILED_STORING_NUMBER);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_modify_number(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_NUMBER,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_NUMBER,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_NUMBER,
+                        STORE_R_FAILED_MODIFYING_NUMBER);
+                return 0;
+                }
+        return 1;
+        }
+
+BIGNUM *STORE_get_number(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        BIGNUM *n;
+
+        check_store(s,STORE_F_STORE_GET_NUMBER,
+                get_object,STORE_R_NO_GET_OBJECT_NUMBER_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_NUMBER, attributes,
+                parameters);
+        if (!object || !object->data.number)
+                {
+                STOREerr(STORE_F_STORE_GET_NUMBER,
+                        STORE_R_FAILED_GETTING_NUMBER);
+                return 0;
+                }
+        n = object->data.number;
+        object->data.number = NULL;
+        STORE_OBJECT_free(object);
+        return n;
+        }
+
+int STORE_delete_number(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_NUMBER,
+                delete_object,STORE_R_NO_DELETE_NUMBER_FUNCTION);
+
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_NUMBER, attributes,
+                    parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_NUMBER,
+                        STORE_R_FAILED_DELETING_NUMBER);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_store_arbitrary(STORE *s, BUF_MEM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_ARBITRARY,
+                store_object,STORE_R_NO_STORE_OBJECT_ARBITRARY_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_ARBITRARY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        object->data.arbitrary = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_ARBITRARY, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_ARBITRARY,
+                        STORE_R_FAILED_STORING_ARBITRARY);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_modify_arbitrary(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_ARBITRARY,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_ARBITRARY,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_ARBITRARY,
+                        STORE_R_FAILED_MODIFYING_ARBITRARY);
+                return 0;
+                }
+        return 1;
+        }
+
+BUF_MEM *STORE_get_arbitrary(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        BUF_MEM *b;
+
+        check_store(s,STORE_F_STORE_GET_ARBITRARY,
+                get_object,STORE_R_NO_GET_OBJECT_ARBITRARY_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_ARBITRARY,
+                attributes, parameters);
+        if (!object || !object->data.arbitrary)
+                {
+                STOREerr(STORE_F_STORE_GET_ARBITRARY,
+                        STORE_R_FAILED_GETTING_ARBITRARY);
+                return 0;
+                }
+        b = object->data.arbitrary;
+        object->data.arbitrary = NULL;
+        STORE_OBJECT_free(object);
+        return b;
+        }
+
+int STORE_delete_arbitrary(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_ARBITRARY,
+                delete_object,STORE_R_NO_DELETE_ARBITRARY_FUNCTION);
+
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_ARBITRARY, attributes,
+                    parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_ARBITRARY,
+                        STORE_R_FAILED_DELETING_ARBITRARY);
+                return 0;
+                }
+        return 1;
+        }
+
+STORE_OBJECT *STORE_OBJECT_new(void)
+        {
+        STORE_OBJECT *object = OPENSSL_malloc(sizeof(STORE_OBJECT));
+        if (object) memset(object, 0, sizeof(STORE_OBJECT));
+        return object;
+        }
+void STORE_OBJECT_free(STORE_OBJECT *data)
+        {
+        if (!data) return;
+        switch (data->type)
+                {
+        case STORE_OBJECT_TYPE_X509_CERTIFICATE:
+                X509_free(data->data.x509.certificate);
+                break;
+        case STORE_OBJECT_TYPE_X509_CRL:
+                X509_CRL_free(data->data.crl);
+                break;
+        case STORE_OBJECT_TYPE_PRIVATE_KEY:
+        case STORE_OBJECT_TYPE_PUBLIC_KEY:
+                EVP_PKEY_free(data->data.key);
+                break;
+        case STORE_OBJECT_TYPE_NUMBER:
+                BN_free(data->data.number);
+                break;
+        case STORE_OBJECT_TYPE_ARBITRARY:
+                BUF_MEM_free(data->data.arbitrary);
+                break;
+                }
+        OPENSSL_free(data);
+        }
+
+IMPLEMENT_STACK_OF(STORE_OBJECT*)
+
+
+struct STORE_attr_info_st
+        {
+        unsigned char set[(STORE_ATTR_TYPE_NUM + 8) / 8];
+        union
+                {
+                char *cstring;
+                unsigned char *sha1string;
+                X509_NAME *dn;
+                BIGNUM *number;
+                void *any;
+                } values[STORE_ATTR_TYPE_NUM+1];
+        size_t value_sizes[STORE_ATTR_TYPE_NUM+1];
+        };
+
+#define ATTR_IS_SET(a,i)        ((i) > 0 && (i) < STORE_ATTR_TYPE_NUM \
+                                && ((a)->set[(i) / 8] & (1 << ((i) % 8))))
+#define SET_ATTRBIT(a,i)        ((a)->set[(i) / 8] |= (1 << ((i) % 8)))
+#define CLEAR_ATTRBIT(a,i)      ((a)->set[(i) / 8] &= ~(1 << ((i) % 8)))
+
+STORE_ATTR_INFO *STORE_ATTR_INFO_new(void)
+        {
+        return (STORE_ATTR_INFO *)OPENSSL_malloc(sizeof(STORE_ATTR_INFO));
+        }
+static void STORE_ATTR_INFO_attr_free(STORE_ATTR_INFO *attrs,
+        STORE_ATTR_TYPES code)
+        {
+        if (ATTR_IS_SET(attrs,code))
+                {
+                switch(code)
+                        {
+                case STORE_ATTR_FRIENDLYNAME:
+                case STORE_ATTR_EMAIL:
+                case STORE_ATTR_FILENAME:
+                        STORE_ATTR_INFO_modify_cstr(attrs, code, NULL, 0);
+                        break;
+                case STORE_ATTR_KEYID:
+                case STORE_ATTR_ISSUERKEYID:
+                case STORE_ATTR_SUBJECTKEYID:
+                case STORE_ATTR_ISSUERSERIALHASH:
+                case STORE_ATTR_CERTHASH:
+                        STORE_ATTR_INFO_modify_sha1str(attrs, code, NULL, 0);
+                        break;
+                case STORE_ATTR_ISSUER:
+                case STORE_ATTR_SUBJECT:
+                        STORE_ATTR_INFO_modify_dn(attrs, code, NULL);
+                        break;
+                case STORE_ATTR_SERIAL:
+                        STORE_ATTR_INFO_modify_number(attrs, code, NULL);
+                        break;
+                default:
+                        break;
+                        }
+                }
+        }
+int STORE_ATTR_INFO_free(STORE_ATTR_INFO *attrs)
+        {
+        if (attrs)
+                {
+                STORE_ATTR_TYPES i;
+                for(i = 0; i++ < STORE_ATTR_TYPE_NUM;)
+                        STORE_ATTR_INFO_attr_free(attrs, i);
+                OPENSSL_free(attrs);
+                }
+        return 1;
+        }
+char *STORE_ATTR_INFO_get0_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_CSTR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].cstring;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_CSTR,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+unsigned char *STORE_ATTR_INFO_get0_sha1str(STORE_ATTR_INFO *attrs,
+        STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_SHA1STR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].sha1string;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_SHA1STR,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+X509_NAME *STORE_ATTR_INFO_get0_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_DN,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].dn;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_DN,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+BIGNUM *STORE_ATTR_INFO_get0_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_NUMBER,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].number;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_NUMBER,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+int STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].cstring = BUF_strndup(cstr, cstr_size)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_set_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_SHA1STR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].sha1string =
+                            (unsigned char *)BUF_memdup(sha1str,
+                                    sha1str_size)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_SHA1STR,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_SHA1STR, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_set_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_DN,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].dn = X509_NAME_dup(dn)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_DN,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_DN, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_set_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_NUMBER,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].number = BN_dup(number)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_NUMBER,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_NUMBER, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_modify_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_CSTR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].cstring);
+                attrs->values[code].cstring = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_cstr(attrs, code, cstr, cstr_size);
+        }
+int STORE_ATTR_INFO_modify_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_SHA1STR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].sha1string);
+                attrs->values[code].sha1string = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_sha1str(attrs, code, sha1str, sha1str_size);
+        }
+int STORE_ATTR_INFO_modify_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_DN,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].dn);
+                attrs->values[code].dn = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_dn(attrs, code, dn);
+        }
+int STORE_ATTR_INFO_modify_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_NUMBER,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].number);
+                attrs->values[code].number = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_number(attrs, code, number);
+        }
+
+struct attr_list_ctx_st
+        {
+        OPENSSL_ITEM *attributes;
+        };
+void *STORE_parse_attrs_start(OPENSSL_ITEM *attributes)
+        {
+        if (attributes)
+                {
+                struct attr_list_ctx_st *context =
+                        (struct attr_list_ctx_st *)OPENSSL_malloc(sizeof(struct attr_list_ctx_st));
+                if (context)
+                        context->attributes = attributes;
+                else
+                        STOREerr(STORE_F_STORE_PARSE_ATTRS_START,
+                                ERR_R_MALLOC_FAILURE);
+                return context;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_START, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+        }
+STORE_ATTR_INFO *STORE_parse_attrs_next(void *handle)
+        {
+        struct attr_list_ctx_st *context = (struct attr_list_ctx_st *)handle;
+
+        if (context && context->attributes)
+                {
+                STORE_ATTR_INFO *attrs = NULL;
+
+                while(context->attributes
+                        && context->attributes->code != STORE_ATTR_OR
+                        && context->attributes->code != STORE_ATTR_END)
+                        {
+                        switch(context->attributes->code)
+                                {
+                        case STORE_ATTR_FRIENDLYNAME:
+                        case STORE_ATTR_EMAIL:
+                        case STORE_ATTR_FILENAME:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_set_cstr(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value,
+                                        context->attributes->value_size);
+                                break;
+                        case STORE_ATTR_KEYID:
+                        case STORE_ATTR_ISSUERKEYID:
+                        case STORE_ATTR_SUBJECTKEYID:
+                        case STORE_ATTR_ISSUERSERIALHASH:
+                        case STORE_ATTR_CERTHASH:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_set_sha1str(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value,
+                                        context->attributes->value_size);
+                                break;
+                        case STORE_ATTR_ISSUER:
+                        case STORE_ATTR_SUBJECT:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_modify_dn(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value);
+                                break;
+                        case STORE_ATTR_SERIAL:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_modify_number(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value);
+                                break;
+                                }
+                        context->attributes++;
+                        }
+                if (context->attributes->code == STORE_ATTR_OR)
+                        context->attributes++;
+                return attrs;
+        err:
+                while(context->attributes
+                        && context->attributes->code != STORE_ATTR_OR
+                        && context->attributes->code != STORE_ATTR_END)
+                        context->attributes++;
+                if (context->attributes->code == STORE_ATTR_OR)
+                        context->attributes++;
+                return NULL;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT, ERR_R_PASSED_NULL_PARAMETER);
+        return NULL;
+        }
+int STORE_parse_attrs_end(void *handle)
+        {
+        struct attr_list_ctx_st *context = (struct attr_list_ctx_st *)handle;
+
+        if (context && context->attributes)
+                {
+#if 0
+                OPENSSL_ITEM *attributes = context->attributes;
+#endif
+                OPENSSL_free(context);
+                return 1;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_END, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+        }
+
+int STORE_parse_attrs_endp(void *handle)
+        {
+        struct attr_list_ctx_st *context = (struct attr_list_ctx_st *)handle;
+
+        if (context && context->attributes)
+                {
+                return context->attributes->code == STORE_ATTR_END;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_ENDP, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+        }
+
+static int attr_info_compare_compute_range(
+        const unsigned char *abits, const unsigned char *bbits,
+        unsigned int *alowp, unsigned int *ahighp,
+        unsigned int *blowp, unsigned int *bhighp)
+        {
+        unsigned int alow = (unsigned int)-1, ahigh = 0;
+        unsigned int blow = (unsigned int)-1, bhigh = 0;
+        int i, res = 0;
+
+        for (i = 0; i < (STORE_ATTR_TYPE_NUM + 8) / 8; i++, abits++, bbits++)
+                {
+                if (res == 0)
+                        {
+                        if (*abits < *bbits) res = -1;
+                        if (*abits > *bbits) res = 1;
+                        }
+                if (*abits)
+                        {
+                        if (alow == (unsigned int)-1)
+                                {
+                                alow = i * 8;
+                                if (!(*abits & 0x01)) alow++;
+                                if (!(*abits & 0x02)) alow++;
+                                if (!(*abits & 0x04)) alow++;
+                                if (!(*abits & 0x08)) alow++;
+                                if (!(*abits & 0x10)) alow++;
+                                if (!(*abits & 0x20)) alow++;
+                                if (!(*abits & 0x40)) alow++;
+                                }
+                        ahigh = i * 8 + 7;
+                        if (!(*abits & 0x80)) ahigh++;
+                        if (!(*abits & 0x40)) ahigh++;
+                        if (!(*abits & 0x20)) ahigh++;
+                        if (!(*abits & 0x10)) ahigh++;
+                        if (!(*abits & 0x08)) ahigh++;
+                        if (!(*abits & 0x04)) ahigh++;
+                        if (!(*abits & 0x02)) ahigh++;
+                        }
+                if (*bbits)
+                        {
+                        if (blow == (unsigned int)-1)
+                                {
+                                blow = i * 8;
+                                if (!(*bbits & 0x01)) blow++;
+                                if (!(*bbits & 0x02)) blow++;
+                                if (!(*bbits & 0x04)) blow++;
+                                if (!(*bbits & 0x08)) blow++;
+                                if (!(*bbits & 0x10)) blow++;
+                                if (!(*bbits & 0x20)) blow++;
+                                if (!(*bbits & 0x40)) blow++;
+                                }
+                        bhigh = i * 8 + 7;
+                        if (!(*bbits & 0x80)) bhigh++;
+                        if (!(*bbits & 0x40)) bhigh++;
+                        if (!(*bbits & 0x20)) bhigh++;
+                        if (!(*bbits & 0x10)) bhigh++;
+                        if (!(*bbits & 0x08)) bhigh++;
+                        if (!(*bbits & 0x04)) bhigh++;
+                        if (!(*bbits & 0x02)) bhigh++;
+                        }
+                }
+        if (ahigh + alow < bhigh + blow) res = -1;
+        if (ahigh + alow > bhigh + blow) res = 1;
+        if (alowp) *alowp = alow;
+        if (ahighp) *ahighp = ahigh;
+        if (blowp) *blowp = blow;
+        if (bhighp) *bhighp = bhigh;
+        return res;
+        }
+
+int STORE_ATTR_INFO_compare(const STORE_ATTR_INFO * const *a,
+                            const STORE_ATTR_INFO * const *b)
+        {
+        if (a == b) return 0;
+        if (!a) return -1;
+        if (!b) return 1;
+        return attr_info_compare_compute_range((*a)->set, (*b)->set, 0, 0, 0, 0);
+        }
+
+int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+        {
+        unsigned int alow, ahigh, blow, bhigh;
+
+        if (a == b) return 1;
+        if (!a) return 0;
+        if (!b) return 0;
+        attr_info_compare_compute_range(a->set, b->set,
+                &alow, &ahigh, &blow, &bhigh);
+        if (alow >= blow && ahigh <= bhigh)
+                return 1;
+        return 0;
+        }
+
+int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+        {
+        unsigned char *abits, *bbits;
+        int i;
+
+        if (a == b) return 1;
+        if (!a) return 0;
+        if (!b) return 0;
+        abits = a->set;
+        bbits = b->set;
+        for (i = 0; i < (STORE_ATTR_TYPE_NUM + 8) / 8; i++, abits++, bbits++)
+                {
+                if (*abits && (*bbits & *abits) != *abits)
+                        return 0;
+                }
+        return 1;
+        }
+
+int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+        {
+        STORE_ATTR_TYPES i;
+
+        if (a == b) return 1;
+        if (!STORE_ATTR_INFO_in(a, b)) return 0;
+        for (i = 1; i < STORE_ATTR_TYPE_NUM; i++)
+                if (ATTR_IS_SET(a, i))
+                        {
+                        switch(i)
+                                {
+                        case STORE_ATTR_FRIENDLYNAME:
+                        case STORE_ATTR_EMAIL:
+                        case STORE_ATTR_FILENAME:
+                                if (strcmp(a->values[i].cstring,
+                                            b->values[i].cstring))
+                                        return 0;
+                                break;
+                        case STORE_ATTR_KEYID:
+                        case STORE_ATTR_ISSUERKEYID:
+                        case STORE_ATTR_SUBJECTKEYID:
+                        case STORE_ATTR_ISSUERSERIALHASH:
+                        case STORE_ATTR_CERTHASH:
+                                if (memcmp(a->values[i].sha1string,
+                                            b->values[i].sha1string,
+                                            a->value_sizes[i]))
+                                        return 0;
+                                break;
+                        case STORE_ATTR_ISSUER:
+                        case STORE_ATTR_SUBJECT:
+                                if (X509_NAME_cmp(a->values[i].dn,
+                                            b->values[i].dn))
+                                        return 0;
+                                break;
+                        case STORE_ATTR_SERIAL:
+                                if (BN_cmp(a->values[i].number,
+                                            b->values[i].number))
+                                        return 0;
+                                break;
+                        default:
+                                break;
+                                }
+                        }
+
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/engine/hw_aep_err.h b/src/lib/libcrypto/store/str_locl.h
index 8fe4cf921f..3f8cb75619 100644
--- a/src/lib/libssl/src/crypto/engine/hw_aep_err.h
+++ b/src/lib/libcrypto/store/str_locl.h
@@ -1,5 +1,9 @@
+/* crypto/store/str_locl.h -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
 /* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -52,50 +56,69 @@
  *
  */
 
-#ifndef HEADER_AEPHK_ERR_H
-#define HEADER_AEPHK_ERR_H
+#ifndef HEADER_STORE_LOCL_H
+#define HEADER_STORE_LOCL_H
 
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_AEPHK_strings(void);
-static void ERR_unload_AEPHK_strings(void);
-static void ERR_AEPHK_error(int function, int reason, char *file, int line);
-#define AEPHKerr(f,r) ERR_AEPHK_error((f),(r),__FILE__,__LINE__)
+#include <openssl/crypto.h>
+#include <openssl/store.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct store_method_st
+        {
+        char *name;
 
-/* Error codes for the AEPHK functions. */
+        /* All the functions return a positive integer or non-NULL for success
+           and 0, a negative integer or NULL for failure */
 
-/* Function codes. */
-#define AEPHK_F_AEP_CTRL                                 100
-#define AEPHK_F_AEP_FINISH                               101
-#define AEPHK_F_AEP_GET_CONNECTION                       102
-#define AEPHK_F_AEP_INIT                                 103
-#define AEPHK_F_AEP_MOD_EXP                              104
-#define AEPHK_F_AEP_MOD_EXP_CRT                          105
-#define AEPHK_F_AEP_RAND                                 106
-#define AEPHK_F_AEP_RSA_MOD_EXP                          107
+        /* Initialise the STORE with private data */
+        STORE_INITIALISE_FUNC_PTR init;
+        /* Initialise the STORE with private data */
+        STORE_CLEANUP_FUNC_PTR clean;
+        /* Generate an object of a given type */
+        STORE_GENERATE_OBJECT_FUNC_PTR generate_object;
+        /* Get an object of a given type.  This function isn't really very
+           useful since the listing functions (below) can be used for the
+           same purpose and are much more general. */
+        STORE_GET_OBJECT_FUNC_PTR get_object;
+        /* Store an object of a given type. */
+        STORE_STORE_OBJECT_FUNC_PTR store_object;
+        /* Modify the attributes bound to an object of a given type. */
+        STORE_MODIFY_OBJECT_FUNC_PTR modify_object;
+        /* Revoke an object of a given type. */
+        STORE_HANDLE_OBJECT_FUNC_PTR revoke_object;
+        /* Delete an object of a given type. */
+        STORE_HANDLE_OBJECT_FUNC_PTR delete_object;
+        /* List a bunch of objects of a given type and with the associated
+           attributes. */
+        STORE_START_OBJECT_FUNC_PTR list_object_start;
+        STORE_NEXT_OBJECT_FUNC_PTR list_object_next;
+        STORE_END_OBJECT_FUNC_PTR list_object_end;
+        STORE_END_OBJECT_FUNC_PTR list_object_endp;
+        /* Store-level function to make any necessary update operations. */
+        STORE_GENERIC_FUNC_PTR update_store;
+        /* Store-level function to get exclusive access to the store. */
+        STORE_GENERIC_FUNC_PTR lock_store;
+        /* Store-level function to release exclusive access to the store. */
+        STORE_GENERIC_FUNC_PTR unlock_store;
 
-/* Reason codes. */
-#define AEPHK_R_ALREADY_LOADED                           100
-#define AEPHK_R_CLOSE_HANDLES_FAILED                     101
-#define AEPHK_R_CONNECTIONS_IN_USE                       102
-#define AEPHK_R_CTRL_COMMAND_NOT_IMPLEMENTED             103
-#define AEPHK_R_FINALIZE_FAILED                          104
-#define AEPHK_R_GET_HANDLE_FAILED                        105
-#define AEPHK_R_GET_RANDOM_FAILED                        106
-#define AEPHK_R_INIT_FAILURE                             107
-#define AEPHK_R_MISSING_KEY_COMPONENTS                   108
-#define AEPHK_R_MOD_EXP_CRT_FAILED                       109
-#define AEPHK_R_MOD_EXP_FAILED                           110
-#define AEPHK_R_NOT_LOADED                               111
-#define AEPHK_R_OK                                       112
-#define AEPHK_R_RETURN_CONNECTION_FAILED                 113
-#define AEPHK_R_SETBNCALLBACK_FAILURE                    114
-#define AEPHK_R_SIZE_TOO_LARGE_OR_TOO_SMALL              116
-#define AEPHK_R_UNIT_FAILURE                             115
+        /* Generic control function */
+        STORE_CTRL_FUNC_PTR ctrl;
+        };
 
+struct store_st
+        {
+        const STORE_METHOD *meth;
+        /* functional reference if 'meth' is ENGINE-provided */
+        ENGINE *engine;
+
+        CRYPTO_EX_DATA ex_data;
+        int references;
+        };
 #ifdef  __cplusplus
 }
 #endif
+
 #endif
diff --git a/src/lib/libcrypto/store/str_mem.c b/src/lib/libcrypto/store/str_mem.c
new file mode 100644
index 0000000000..8ac4f7e55c
--- /dev/null
+++ b/src/lib/libcrypto/store/str_mem.c
@@ -0,0 +1,365 @@
+/* crypto/store/str_mem.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include <openssl/err.h>
+#include "str_locl.h"
+
+/* The memory store is currently highly experimental.  It's meant to become
+   a base store used by other stores for internal caching (for full caching
+   support, aging needs to be added).
+
+   The database use is meant to support as much attribute association as
+   possible, while providing for as small search ranges as possible.
+   This is currently provided for by sorting the entries by numbers that
+   are composed of bits set at the positions indicated by attribute type
+   codes.  This provides for ranges determined by the highest attribute
+   type code value.  A better idea might be to sort by values computed
+   from the range of attributes associated with the object (basically,
+   the difference between the highest and lowest attribute type code)
+   and it's distance from a base (basically, the lowest associated
+   attribute type code).
+*/
+
+typedef struct mem_object_data_st
+        {
+        STORE_OBJECT *object;
+        STORE_ATTR_INFO *attr_info;
+        int references;
+        } MEM_OBJECT_DATA;
+
+DECLARE_STACK_OF(MEM_OBJECT_DATA)
+struct mem_data_st
+        {
+        STACK_OF(MEM_OBJECT_DATA) *data; /* sorted with
+                                          * STORE_ATTR_INFO_compare(). */
+        unsigned int compute_components : 1; /* Currently unused, but can
+                                                be used to add attributes
+                                                from parts of the data. */
+        };
+
+DECLARE_STACK_OF(STORE_ATTR_INFO)
+struct mem_ctx_st
+        {
+        int type;               /* The type we're searching for */
+        STACK_OF(STORE_ATTR_INFO) *search_attributes; /* Sets of
+                                     attributes to search for.  Each
+                                     element is a STORE_ATTR_INFO. */
+        int search_index;       /* which of the search attributes we
+                                   found a match for, -1 when we still
+                                   haven't found any */
+        int index;              /* -1 as long as we're searching for
+                                    the first */
+        };
+
+static int mem_init(STORE *s);
+static void mem_clean(STORE *s);
+static STORE_OBJECT *mem_generate(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static STORE_OBJECT *mem_get(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static int mem_store(STORE *s, STORE_OBJECT_TYPES type,
+        STORE_OBJECT *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_modify(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM search_attributes[], OPENSSL_ITEM add_attributes[],
+        OPENSSL_ITEM modify_attributes[], OPENSSL_ITEM delete_attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_delete(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static void *mem_list_start(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static STORE_OBJECT *mem_list_next(STORE *s, void *handle);
+static int mem_list_end(STORE *s, void *handle);
+static int mem_list_endp(STORE *s, void *handle);
+static int mem_lock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_unlock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_ctrl(STORE *s, int cmd, long l, void *p, void (*f)(void));
+
+static STORE_METHOD store_memory =
+        {
+        "OpenSSL memory store interface",
+        mem_init,
+        mem_clean,
+        mem_generate,
+        mem_get,
+        mem_store,
+        mem_modify,
+        NULL, /* revoke */
+        mem_delete,
+        mem_list_start,
+        mem_list_next,
+        mem_list_end,
+        mem_list_endp,
+        NULL, /* update */
+        mem_lock,
+        mem_unlock,
+        mem_ctrl
+        };
+
+const STORE_METHOD *STORE_Memory(void)
+        {
+        return &store_memory;
+        }
+
+static int mem_init(STORE *s)
+        {
+        return 1;
+        }
+
+static void mem_clean(STORE *s)
+        {
+        return;
+        }
+
+static STORE_OBJECT *mem_generate(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_GENERATE, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+static STORE_OBJECT *mem_get(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        void *context = mem_list_start(s, type, attributes, parameters);
+        
+        if (context)
+                {
+                STORE_OBJECT *object = mem_list_next(s, context);
+
+                if (mem_list_end(s, context))
+                        return object;
+                }
+        return NULL;
+        }
+static int mem_store(STORE *s, STORE_OBJECT_TYPES type,
+        STORE_OBJECT *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_STORE, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+static int mem_modify(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM search_attributes[], OPENSSL_ITEM add_attributes[],
+        OPENSSL_ITEM modify_attributes[], OPENSSL_ITEM delete_attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_MODIFY, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+static int mem_delete(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_DELETE, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+
+/* The list functions may be the hardest to understand.  Basically,
+   mem_list_start compiles a stack of attribute info elements, and
+   puts that stack into the context to be returned.  mem_list_next
+   will then find the first matching element in the store, and then
+   walk all the way to the end of the store (since any combination
+   of attribute bits above the starting point may match the searched
+   for bit pattern...). */
+static void *mem_list_start(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        struct mem_ctx_st *context =
+                (struct mem_ctx_st *)OPENSSL_malloc(sizeof(struct mem_ctx_st));
+        void *attribute_context = NULL;
+        STORE_ATTR_INFO *attrs = NULL;
+
+        if (!context)
+                {
+                STOREerr(STORE_F_MEM_LIST_START, ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        memset(context, 0, sizeof(struct mem_ctx_st));
+
+        attribute_context = STORE_parse_attrs_start(attributes);
+        if (!attribute_context)
+                {
+                STOREerr(STORE_F_MEM_LIST_START, ERR_R_STORE_LIB);
+                goto err;
+                }
+
+        while((attrs = STORE_parse_attrs_next(attribute_context)))
+                {
+                if (context->search_attributes == NULL)
+                        {
+                        context->search_attributes =
+                                sk_STORE_ATTR_INFO_new(STORE_ATTR_INFO_compare);
+                        if (!context->search_attributes)
+                                {
+                                STOREerr(STORE_F_MEM_LIST_START,
+                                        ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        }
+                sk_STORE_ATTR_INFO_push(context->search_attributes,attrs);
+                }
+        if (!STORE_parse_attrs_endp(attribute_context))
+                goto err;
+        STORE_parse_attrs_end(attribute_context);
+        context->search_index = -1;
+        context->index = -1;
+        return context;
+ err:
+        if (attribute_context) STORE_parse_attrs_end(attribute_context);
+        mem_list_end(s, context);
+        return NULL;
+        }
+static STORE_OBJECT *mem_list_next(STORE *s, void *handle)
+        {
+        int i;
+        struct mem_ctx_st *context = (struct mem_ctx_st *)handle;
+        struct mem_object_data_st key = { 0, 0, 1 };
+        struct mem_data_st *store =
+                (struct mem_data_st *)STORE_get_ex_data(s, 1);
+        int srch;
+        int cres = 0;
+
+        if (!context)
+                {
+                STOREerr(STORE_F_MEM_LIST_NEXT, ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (!store)
+                {
+                STOREerr(STORE_F_MEM_LIST_NEXT, STORE_R_NO_STORE);
+                return NULL;
+                }
+
+        if (context->search_index == -1)
+                {
+                for (i = 0;
+                     i < sk_STORE_ATTR_INFO_num(context->search_attributes);
+                     i++)
+                        {
+                        key.attr_info
+                          = sk_STORE_ATTR_INFO_value(context->search_attributes,
+                                                     i);
+                        srch = sk_MEM_OBJECT_DATA_find_ex(store->data, &key);
+
+                        if (srch >= 0)
+                                {
+                                context->search_index = srch;
+                                break;
+                                }
+                        }
+                }
+        if (context->search_index < 0)
+                return NULL;
+        
+        key.attr_info =
+                sk_STORE_ATTR_INFO_value(context->search_attributes,
+                                         context->search_index);
+        for(srch = context->search_index;
+            srch < sk_MEM_OBJECT_DATA_num(store->data)
+                    && STORE_ATTR_INFO_in_range(key.attr_info,
+                            sk_MEM_OBJECT_DATA_value(store->data, srch)->attr_info)
+                    && !(cres = STORE_ATTR_INFO_in_ex(key.attr_info,
+                                 sk_MEM_OBJECT_DATA_value(store->data, srch)->attr_info));
+            srch++)
+                ;
+
+        context->search_index = srch;
+        if (cres)
+                return (sk_MEM_OBJECT_DATA_value(store->data, srch))->object;
+        return NULL;
+        }
+static int mem_list_end(STORE *s, void *handle)
+        {
+        struct mem_ctx_st *context = (struct mem_ctx_st *)handle;
+
+        if (!context)
+                {
+                STOREerr(STORE_F_MEM_LIST_END, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (context && context->search_attributes)
+                sk_STORE_ATTR_INFO_free(context->search_attributes);
+        if (context) OPENSSL_free(context);
+        return 1;
+        }
+static int mem_list_endp(STORE *s, void *handle)
+        {
+        struct mem_ctx_st *context = (struct mem_ctx_st *)handle;
+
+        if (!context
+            || context->search_index
+               == sk_STORE_ATTR_INFO_num(context->search_attributes))
+                return 1;
+        return 0;
+        }
+static int mem_lock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        return 1;
+        }
+static int mem_unlock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        return 1;
+        }
+static int mem_ctrl(STORE *s, int cmd, long l, void *p, void (*f)(void))
+        {
+        return 1;
+        }
diff --git a/src/lib/libcrypto/store/str_meth.c b/src/lib/libcrypto/store/str_meth.c
new file mode 100644
index 0000000000..a46de03a26
--- /dev/null
+++ b/src/lib/libcrypto/store/str_meth.c
@@ -0,0 +1,250 @@
+/* crypto/store/str_meth.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include <openssl/buffer.h>
+#include "str_locl.h"
+
+STORE_METHOD *STORE_create_method(char *name)
+        {
+        STORE_METHOD *store_method = (STORE_METHOD *)OPENSSL_malloc(sizeof(STORE_METHOD));
+
+        if (store_method)
+                {
+                memset(store_method, 0, sizeof(*store_method));
+                store_method->name = BUF_strdup(name);
+                }
+        return store_method;
+        }
+
+/* BIG FSCKING WARNING!!!!  If you use this on a statically allocated method
+   (that is, it hasn't been allocated using STORE_create_method(), you deserve
+   anything Murphy can throw at you and more!  You have been warned. */
+void STORE_destroy_method(STORE_METHOD *store_method)
+        {
+        if (!store_method) return;
+        OPENSSL_free(store_method->name);
+        store_method->name = NULL;
+        OPENSSL_free(store_method);
+        }
+
+int STORE_method_set_initialise_function(STORE_METHOD *sm, STORE_INITIALISE_FUNC_PTR init_f)
+        {
+        sm->init = init_f;
+        return 1;
+        }
+
+int STORE_method_set_cleanup_function(STORE_METHOD *sm, STORE_CLEANUP_FUNC_PTR clean_f)
+        {
+        sm->clean = clean_f;
+        return 1;
+        }
+
+int STORE_method_set_generate_function(STORE_METHOD *sm, STORE_GENERATE_OBJECT_FUNC_PTR generate_f)
+        {
+        sm->generate_object = generate_f;
+        return 1;
+        }
+
+int STORE_method_set_get_function(STORE_METHOD *sm, STORE_GET_OBJECT_FUNC_PTR get_f)
+        {
+        sm->get_object = get_f;
+        return 1;
+        }
+
+int STORE_method_set_store_function(STORE_METHOD *sm, STORE_STORE_OBJECT_FUNC_PTR store_f)
+        {
+        sm->store_object = store_f;
+        return 1;
+        }
+
+int STORE_method_set_modify_function(STORE_METHOD *sm, STORE_MODIFY_OBJECT_FUNC_PTR modify_f)
+        {
+        sm->modify_object = modify_f;
+        return 1;
+        }
+
+int STORE_method_set_revoke_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR revoke_f)
+        {
+        sm->revoke_object = revoke_f;
+        return 1;
+        }
+
+int STORE_method_set_delete_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR delete_f)
+        {
+        sm->delete_object = delete_f;
+        return 1;
+        }
+
+int STORE_method_set_list_start_function(STORE_METHOD *sm, STORE_START_OBJECT_FUNC_PTR list_start_f)
+        {
+        sm->list_object_start = list_start_f;
+        return 1;
+        }
+
+int STORE_method_set_list_next_function(STORE_METHOD *sm, STORE_NEXT_OBJECT_FUNC_PTR list_next_f)
+        {
+        sm->list_object_next = list_next_f;
+        return 1;
+        }
+
+int STORE_method_set_list_end_function(STORE_METHOD *sm, STORE_END_OBJECT_FUNC_PTR list_end_f)
+        {
+        sm->list_object_end = list_end_f;
+        return 1;
+        }
+
+int STORE_method_set_update_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR update_f)
+        {
+        sm->update_store = update_f;
+        return 1;
+        }
+
+int STORE_method_set_lock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR lock_f)
+        {
+        sm->lock_store = lock_f;
+        return 1;
+        }
+
+int STORE_method_set_unlock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR unlock_f)
+        {
+        sm->unlock_store = unlock_f;
+        return 1;
+        }
+
+int STORE_method_set_ctrl_function(STORE_METHOD *sm, STORE_CTRL_FUNC_PTR ctrl_f)
+        {
+        sm->ctrl = ctrl_f;
+        return 1;
+        }
+
+STORE_INITIALISE_FUNC_PTR STORE_method_get_initialise_function(STORE_METHOD *sm)
+        {
+        return sm->init;
+        }
+
+STORE_CLEANUP_FUNC_PTR STORE_method_get_cleanup_function(STORE_METHOD *sm)
+        {
+        return sm->clean;
+        }
+
+STORE_GENERATE_OBJECT_FUNC_PTR STORE_method_get_generate_function(STORE_METHOD *sm)
+        {
+        return sm->generate_object;
+        }
+
+STORE_GET_OBJECT_FUNC_PTR STORE_method_get_get_function(STORE_METHOD *sm)
+        {
+        return sm->get_object;
+        }
+
+STORE_STORE_OBJECT_FUNC_PTR STORE_method_get_store_function(STORE_METHOD *sm)
+        {
+        return sm->store_object;
+        }
+
+STORE_MODIFY_OBJECT_FUNC_PTR STORE_method_get_modify_function(STORE_METHOD *sm)
+        {
+        return sm->modify_object;
+        }
+
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_revoke_function(STORE_METHOD *sm)
+        {
+        return sm->revoke_object;
+        }
+
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_delete_function(STORE_METHOD *sm)
+        {
+        return sm->delete_object;
+        }
+
+STORE_START_OBJECT_FUNC_PTR STORE_method_get_list_start_function(STORE_METHOD *sm)
+        {
+        return sm->list_object_start;
+        }
+
+STORE_NEXT_OBJECT_FUNC_PTR STORE_method_get_list_next_function(STORE_METHOD *sm)
+        {
+        return sm->list_object_next;
+        }
+
+STORE_END_OBJECT_FUNC_PTR STORE_method_get_list_end_function(STORE_METHOD *sm)
+        {
+        return sm->list_object_end;
+        }
+
+STORE_GENERIC_FUNC_PTR STORE_method_get_update_store_function(STORE_METHOD *sm)
+        {
+        return sm->update_store;
+        }
+
+STORE_GENERIC_FUNC_PTR STORE_method_get_lock_store_function(STORE_METHOD *sm)
+        {
+        return sm->lock_store;
+        }
+
+STORE_GENERIC_FUNC_PTR STORE_method_get_unlock_store_function(STORE_METHOD *sm)
+        {
+        return sm->unlock_store;
+        }
+
+STORE_CTRL_FUNC_PTR STORE_method_get_ctrl_function(STORE_METHOD *sm)
+        {
+        return sm->ctrl;
+        }
+
diff --git a/src/lib/libcrypto/threads/netware.bat b/src/lib/libcrypto/threads/netware.bat
new file mode 100644
index 0000000000..0b3eca3caf
--- /dev/null
+++ b/src/lib/libcrypto/threads/netware.bat
@@ -0,0 +1,79 @@
+@echo off
+rem batch file to build multi-thread test ( mttest.nlm )
+
+rem command line arguments:
+rem      debug => build using debug settings
+
+rem
+rem After building, copy mttest.nlm to the server and run it, you'll probably
+rem want to redirect stdout and stderr.  An example command line would be
+rem "mttest.nlm -thread 20 -loops 10 -CAfile \openssl\apps\server.pem >mttest.out 2>mttest.err"
+rem 
+
+del mttest.nlm
+
+set BLD_DEBUG=
+set CFLAGS=
+set LFLAGS=
+set LIBS=
+
+if "%1" == "DEBUG" set BLD_DEBUG=YES
+if "%1" == "debug" set BLD_DEBUG=YES
+
+if "%MWCIncludes%" == "" goto inc_error
+if "%PRELUDE%" == "" goto prelude_error
+if "%IMPORTS%" == "" goto imports_error
+
+set CFLAGS=-c -I..\..\outinc_nw -nosyspath -DOPENSSL_SYS_NETWARE -opt off -g -sym internal -maxerrors 20
+
+if "%BLD_DEBUG%" == "YES" set LIBS=..\..\out_nw.dbg\ssl.lib ..\..\out_nw.dbg\crypto.lib
+if "%BLD_DEBUG%" == ""  set LIBS=..\..\out_nw\ssl.lib ..\..\out_nw\crypto.lib
+
+set LFLAGS=-msgstyle gcc -zerobss -stacksize 32768 -nostdlib -sym internal 
+  
+rem generate command file for metrowerks
+echo.
+echo Generating Metrowerks command file: mttest.def
+echo # dynamically generated command file for metrowerks build > mttest.def
+echo IMPORT @%IMPORTS%\clib.imp              >> mttest.def 
+echo IMPORT @%IMPORTS%\threads.imp           >> mttest.def 
+echo IMPORT @%IMPORTS%\ws2nlm.imp            >> mttest.def 
+echo IMPORT GetProcessSwitchCount            >> mttest.def
+echo MODULE clib                             >> mttest.def 
+
+rem compile
+echo.
+echo Compiling mttest.c
+mwccnlm.exe mttest.c %CFLAGS% 
+if errorlevel 1 goto end
+
+rem link               
+echo.
+echo Linking mttest.nlm
+mwldnlm.exe %LFLAGS% -screenname mttest -commandfile mttest.def mttest.o "%PRELUDE%" %LIBS% -o mttest.nlm
+if errorlevel 1 goto end
+
+goto end
+
+:inc_error
+echo.
+echo Environment variable MWCIncludes is not set - see install.nw
+goto end
+
+:prelude_error
+echo.
+echo Environment variable PRELUDE is not set - see install.nw
+goto end
+
+:imports_error
+echo.
+echo Environment variable IMPORTS is not set - see install.nw
+goto end
+    
+    
+:end
+set BLD_DEBUG=
+set CFLAGS=
+set LFLAGS=
+set LIBS=
+
diff --git a/src/lib/libcrypto/tmdiff.c b/src/lib/libcrypto/tmdiff.c
deleted file mode 100644
index 1c6e052ac9..0000000000
--- a/src/lib/libcrypto/tmdiff.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* crypto/tmdiff.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include "cryptlib.h"
-#include <openssl/tmdiff.h>
-#if !defined(OPENSSL_SYS_MSDOS)
-#include OPENSSL_UNISTD
-#endif
-
-#ifdef TIMEB
-#undef OPENSSL_SYS_WIN32
-#undef TIMES
-#endif
-
-#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32) && !(defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX_RHAPSODY) && !defined(OPENSSL_SYS_VXWORKS)
-# define TIMES
-#endif
-
-#ifdef OPENSSL_SYS_NETWARE
-#undef TIMES
-#endif
-
-#if !defined(_IRIX) || defined (OPENSSL_SYS_NETWARE)
-#  include <time.h>
-#endif
-#ifdef TIMES
-#  include <sys/types.h>
-#  include <sys/times.h>
-#endif
-
-/* Depending on the VMS version, the tms structure is perhaps defined.
-   The __TMS macro will show if it was.  If it wasn't defined, we should
-   undefine TIMES, since that tells the rest of the program how things
-   should be handled.                           -- Richard Levitte */
-#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
-#undef TIMES
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_NETWARE)
-#include <sys/timeb.h>
-#endif
-
-#ifdef OPENSSL_SYS_WIN32
-#include <windows.h>
-#endif
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# if defined(_SC_CLK_TCK) \
-     && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
-/* #  define HZ ((double)sysconf(_SC_CLK_TCK)) */
-#  define HZ sysconf(_SC_CLK_TCK)
-# else
-#  ifndef CLK_TCK
-#   ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
-#    define HZ  100.0
-#   else /* _BSD_CLK_TCK_ */
-#    define HZ ((double)_BSD_CLK_TCK_)
-#   endif
-#  else /* CLK_TCK */
-#   define HZ ((double)CLK_TCK)
-#  endif
-# endif
-#endif
-
-struct ms_tm
-        {
-#ifdef TIMES
-        struct tms ms_tms;
-#else
-#  ifdef OPENSSL_SYS_WIN32
-        HANDLE thread_id;
-        FILETIME ms_win32;
-#  elif defined (OPENSSL_SYS_NETWARE)
-   clock_t ms_clock;
-#  else
-#    ifdef OPENSSL_SYS_VXWORKS
-          unsigned long ticks;
-#    else
-        struct timeb ms_timeb;
-#    endif
-#  endif
-#endif
-        };
-
-MS_TM *ms_time_new(void)
-        {
-        MS_TM *ret;
-
-        ret=(MS_TM *)OPENSSL_malloc(sizeof(MS_TM));
-        if (ret == NULL)
-                return(NULL);
-        memset(ret,0,sizeof(MS_TM));
-#ifdef OPENSSL_SYS_WIN32
-        ret->thread_id=GetCurrentThread();
-#endif
-        return ret;
-        }
-
-void ms_time_free(MS_TM *a)
-        {
-        if (a != NULL)
-                OPENSSL_free(a);
-        }
-
-void ms_time_get(MS_TM *tm)
-        {
-#ifdef OPENSSL_SYS_WIN32
-        FILETIME tmpa,tmpb,tmpc;
-#endif
-
-#ifdef TIMES
-        times(&tm->ms_tms);
-#else
-#  ifdef OPENSSL_SYS_WIN32
-        GetThreadTimes(tm->thread_id,&tmpa,&tmpb,&tmpc,&(tm->ms_win32));
-#  elif defined (OPENSSL_SYS_NETWARE)
-   tm->ms_clock = clock();
-#  else
-#    ifdef OPENSSL_SYS_VXWORKS
-        tm->ticks = tickGet();
-#    else
-        ftime(&tm->ms_timeb);
-#    endif
-#  endif
-#endif
-        }
-
-double ms_time_diff(MS_TM *a, MS_TM *b)
-        {
-        double ret;
-
-#ifdef TIMES
-        ret = HZ;
-        ret = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / ret;
-#else
-# ifdef OPENSSL_SYS_WIN32
-        {
-#ifdef __GNUC__
-        signed long long la,lb;
-#else
-        signed _int64 la,lb;
-#endif
-        la=a->ms_win32.dwHighDateTime;
-        lb=b->ms_win32.dwHighDateTime;
-        la<<=32;
-        lb<<=32;
-        la+=a->ms_win32.dwLowDateTime;
-        lb+=b->ms_win32.dwLowDateTime;
-        ret=((double)(lb-la))/1e7;
-        }
-# elif defined (OPENSSL_SYS_NETWARE)
-    ret= (double)(b->ms_clock - a->ms_clock);
-# else
-#  ifdef OPENSSL_SYS_VXWORKS
-        ret = (double)(b->ticks - a->ticks) / (double)sysClkRateGet();
-#  else
-        ret=     (double)(b->ms_timeb.time-a->ms_timeb.time)+
-                (((double)b->ms_timeb.millitm)-
-                ((double)a->ms_timeb.millitm))/1000.0;
-#  endif
-# endif
-#endif
-        return((ret < 0.0000001)?0.0000001:ret);
-        }
-
-int ms_time_cmp(const MS_TM *a, const MS_TM *b)
-        {
-        double d;
-        int ret;
-
-#ifdef TIMES
-        d = HZ;
-        d = (b->ms_tms.tms_utime-a->ms_tms.tms_utime) / d;
-#else
-# ifdef OPENSSL_SYS_WIN32
-        d =(b->ms_win32.dwHighDateTime&0x000fffff)*10+b->ms_win32.dwLowDateTime/1e7;
-        d-=(a->ms_win32.dwHighDateTime&0x000fffff)*10+a->ms_win32.dwLowDateTime/1e7;
-# elif defined (OPENSSL_SYS_NETWARE)
-    d= (double)(b->ms_clock - a->ms_clock);
-# else
-#  ifdef OPENSSL_SYS_VXWORKS
-        d = (b->ticks - a->ticks);
-#  else
-        d=       (double)(b->ms_timeb.time-a->ms_timeb.time)+
-                (((double)b->ms_timeb.millitm)-(double)a->ms_timeb.millitm)/1000.0;
-#  endif
-# endif
-#endif
-        if (d == 0.0)
-                ret=0;
-        else if (d < 0)
-                ret= -1;
-        else
-                ret=1;
-        return(ret);
-        }
-
diff --git a/src/lib/libcrypto/tmdiff.h b/src/lib/libcrypto/tmdiff.h
deleted file mode 100644
index af5c41c649..0000000000
--- a/src/lib/libcrypto/tmdiff.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* crypto/tmdiff.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Header for dynamic hash table routines
- * Author - Eric Young
- */
-/* ... erm yeah, "dynamic hash tables" you say?
- * 
- * And what would dynamic hash tables have to do with any of this code *now*?
- * AFAICS, this code is only referenced by crypto/bn/exp.c which is an unused
- * file that I doubt compiles any more. speed.c is the only thing that could
- * use this (and it has nothing to do with hash tables), yet it instead has its
- * own duplication of all this stuff and looks, if anything, more complete. See
- * the corresponding note in apps/speed.c.
- * The Bemused - Geoff
- */
-
-#ifndef HEADER_TMDIFF_H
-#define HEADER_TMDIFF_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct ms_tm MS_TM;
-
-MS_TM *ms_time_new(void );
-void ms_time_free(MS_TM *a);
-void ms_time_get(MS_TM *a);
-double ms_time_diff(MS_TM *start, MS_TM *end);
-int ms_time_cmp(const MS_TM *ap, const MS_TM *bp);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/src/lib/libcrypto/ts/Makefile b/src/lib/libcrypto/ts/Makefile
new file mode 100644
index 0000000000..c18234555b
--- /dev/null
+++ b/src/lib/libcrypto/ts/Makefile
@@ -0,0 +1,269 @@
+#
+# SSLeay/crypto/ts/Makefile
+#
+
+DIR=    ts
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I../../include
+CFLAG = -g
+INSTALL_PREFIX=
+OPENSSLDIR=     /usr/local/ssl
+INSTALLTOP=/usr/local/ssl
+MAKEDEPPROG=    makedepend
+MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
+MAKEFILE=       Makefile
+AR=             ar r
+
+PEX_LIBS=
+EX_LIBS=
+ 
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL= Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= 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
+LIBOBJ= ts_err.o ts_req_utils.o ts_req_print.o ts_rsp_utils.o ts_rsp_print.o \
+        ts_rsp_sign.o ts_rsp_verify.o ts_verify_ctx.o ts_lib.o ts_conf.o \
+        ts_asn1.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= ts.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+test:
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff enc dec sign verify
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+ts_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+ts_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_asn1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+ts_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ts_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+ts_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ts_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ts_asn1.o: ../../include/openssl/ts.h ../../include/openssl/x509.h
+ts_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+ts_asn1.o: ts_asn1.c
+ts_conf.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_conf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_conf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_conf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_conf.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+ts_conf.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+ts_conf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ts_conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ts_conf.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+ts_conf.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+ts_conf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_conf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_conf.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_conf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_conf.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_conf.c
+ts_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ts_err.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+ts_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+ts_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+ts_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ts_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ts_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+ts_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ts_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ts_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_err.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_err.o: ../../include/openssl/x509v3.h ts_err.c
+ts_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ts_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+ts_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+ts_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ts_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+ts_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ts_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ts_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ts.h ts_lib.c
+ts_req_print.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_req_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+ts_req_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+ts_req_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+ts_req_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+ts_req_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ts_req_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ts_req_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+ts_req_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ts_req_print.o: ../../include/openssl/opensslconf.h
+ts_req_print.o: ../../include/openssl/opensslv.h
+ts_req_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_req_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_req_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_req_print.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_req_print.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_req_print.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_req_print.c
+ts_req_utils.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_req_utils.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_req_utils.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_req_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_req_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_req_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_req_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_req_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_req_utils.o: ../../include/openssl/objects.h
+ts_req_utils.o: ../../include/openssl/opensslconf.h
+ts_req_utils.o: ../../include/openssl/opensslv.h
+ts_req_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_req_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_req_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_req_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_req_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_req_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_req_utils.c
+ts_rsp_print.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+ts_rsp_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+ts_rsp_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+ts_rsp_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+ts_rsp_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ts_rsp_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ts_rsp_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+ts_rsp_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ts_rsp_print.o: ../../include/openssl/opensslconf.h
+ts_rsp_print.o: ../../include/openssl/opensslv.h
+ts_rsp_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_print.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ts_rsp_print.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+ts_rsp_print.o: ../cryptlib.h ts.h ts_rsp_print.c
+ts_rsp_sign.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_rsp_sign.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_rsp_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_rsp_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_rsp_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_rsp_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_rsp_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_rsp_sign.o: ../../include/openssl/objects.h
+ts_rsp_sign.o: ../../include/openssl/opensslconf.h
+ts_rsp_sign.o: ../../include/openssl/opensslv.h
+ts_rsp_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_rsp_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_rsp_sign.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_sign.c
+ts_rsp_utils.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_utils.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_rsp_utils.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_rsp_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_rsp_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_rsp_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_rsp_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_rsp_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_rsp_utils.o: ../../include/openssl/objects.h
+ts_rsp_utils.o: ../../include/openssl/opensslconf.h
+ts_rsp_utils.o: ../../include/openssl/opensslv.h
+ts_rsp_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_rsp_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_rsp_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_utils.c
+ts_rsp_verify.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_rsp_verify.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_rsp_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_rsp_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_rsp_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_rsp_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_rsp_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_rsp_verify.o: ../../include/openssl/objects.h
+ts_rsp_verify.o: ../../include/openssl/opensslconf.h
+ts_rsp_verify.o: ../../include/openssl/opensslv.h
+ts_rsp_verify.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_rsp_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_rsp_verify.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_verify.c
+ts_verify_ctx.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_verify_ctx.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_verify_ctx.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_verify_ctx.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_verify_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_verify_ctx.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_verify_ctx.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_verify_ctx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_verify_ctx.o: ../../include/openssl/objects.h
+ts_verify_ctx.o: ../../include/openssl/opensslconf.h
+ts_verify_ctx.o: ../../include/openssl/opensslv.h
+ts_verify_ctx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_verify_ctx.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_verify_ctx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_verify_ctx.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_verify_ctx.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_verify_ctx.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_verify_ctx.c
diff --git a/src/lib/libcrypto/util/arx.pl b/src/lib/libcrypto/util/arx.pl
deleted file mode 100644
index ce62625c33..0000000000
--- a/src/lib/libcrypto/util/arx.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/perl
-
-# Simple perl script to wrap round "ar" program and exclude any
-# object files in the environment variable EXCL_OBJ
-
-map { s/^.*\/([^\/]*)$/$1/ ; $EXCL{$_} = 1} split(' ', $ENV{EXCL_OBJ});
-
-#my @ks = keys %EXCL;
-#print STDERR "Excluding: @ks \n";
-
-my @ARGS = grep { !exists $EXCL{$_} } @ARGV;    
-
-system @ARGS;
-
-exit $? >> 8;
diff --git a/src/lib/libcrypto/util/checkhash.pl b/src/lib/libcrypto/util/checkhash.pl
deleted file mode 100644
index c61fa72178..0000000000
--- a/src/lib/libcrypto/util/checkhash.pl
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env perl -w
-
-my $package = caller;
-
-if (!(defined $package))
-        {
-        my $retval = check_hashes(@ARGV);
-        exit $retval;
-        }
-
-1;
-
-sub check_hashes
-        {
-
-        my @args = @_;
-
-        my $change_dir = "";
-        my $check_program = "sha/fips_standalone_sha1";
-
-        my $verbose = 0;
-        my $badfiles = 0;
-        my $rebuild = 0;
-        my $force_rewrite = 0;
-        my $hash_file = "fipshashes.c";
-        my $recurse = 0;
-
-        my @fingerprint_files;
-
-        while (@args)
-                {
-                my $arg = $args[0];
-                if ($arg eq "-chdir")
-                        {
-                        shift @args;
-                        $change_dir = shift @args;
-                        }
-                elsif ($arg eq "-rebuild")
-                        {
-                        shift @args;
-                        $rebuild = 1;
-                        }
-                elsif ($arg eq "-verbose")
-                        {
-                        shift @args;
-                        $verbose = 1;
-                        }
-                elsif ($arg eq "-force-rewrite")
-                        {
-                        shift @args;
-                        $force_rewrite = 1;
-                        }
-                elsif ($arg eq "-hash_file")
-                        {
-                        shift @args;
-                        $hash_file = shift @args;
-                        }
-                elsif ($arg eq "-recurse")
-                        {
-                        shift @args;
-                        $recurse = 1;
-                        }
-                elsif ($arg eq "-program_path")
-                        {
-                        shift @args;
-                        $check_program = shift @args;
-                        }
-                else
-                        {
-                        print STDERR "Unknown Option $arg";
-                        return 1;
-                        }
-
-                }
-
-        chdir $change_dir if $change_dir ne "";
-
-        if ($recurse)
-                {
-                @fingerprint_files = ("fingerprint.sha1",
-                                        <*/fingerprint.sha1>);
-                }
-        else
-                {
-                push @fingerprint_files, $hash_file;
-                }
-
-        foreach $fp (@fingerprint_files)
-                {
-                if (!open(IN, "$fp"))
-                        {
-                        print STDERR "Can't open file $fp";
-                        return 1;
-                        }
-                print STDERR "Opening Fingerprint file $fp\n" if $verbose;
-                my $dir = $fp;
-                $dir =~ s/[^\/]*$//;
-                while (<IN>)
-                        {
-                        chomp;
-                        if (!(($file, $hash) = /^\"HMAC-SHA1\((.*)\)\s*=\s*(\w*)\",$/))
-                                {
-                                /^\"/ || next;
-                                print STDERR "FATAL: Invalid syntax in file $fp\n";
-                                print STDERR "Line:\n$_\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        if (!$rebuild && length($hash) != 40)
-                                {
-                                print STDERR "FATAL: Invalid hash length in $fp for file $file\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        push @hashed_files, "$dir$file";
-                        if (exists $hashes{"$dir$file"})
-                                {
-                                print STDERR "FATAL: Duplicate Hash file $dir$file\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        if (! -r "$dir$file")
-                                {
-                                print STDERR "FATAL: Can't access $dir$file\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        $hashes{"$dir$file"} = $hash;
-                        }
-                close IN;
-                }
-
-        @checked_hashes = `$check_program @hashed_files`;
-
-        if ($? != 0)
-                {
-                print STDERR "Error running hash program $check_program\n";
-                fatal_error();
-                return 1;
-                }
-
-        if (@checked_hashes != @hashed_files)
-                {
-                print STDERR "FATAL: hash count incorrect\n";
-                fatal_error();
-                return 1;
-                }
-
-        foreach (@checked_hashes)
-                {
-                chomp;
-                if (!(($file, $hash) = /^HMAC-SHA1\((.*)\)\s*=\s*(\w*)$/))
-                        {
-                        print STDERR "FATAL: Invalid syntax in file $fp\n";
-                        print STDERR "Line:\n$_\n";
-                        fatal_error();
-                        return 1;
-                        }
-                if (length($hash) != 40)
-                        {
-                        print STDERR "FATAL: Invalid hash length for file $file\n";
-                        fatal_error();
-                        return 1;
-                        }
-                if ($hash ne $hashes{$file})
-                        {
-                        if ($rebuild)
-                                {
-                                print STDERR "Updating hash on file $file\n";
-                                $hashes{$file} = $hash;
-                                }
-                        else
-                                {
-                                print STDERR "Hash check failed for file $file\n";
-                                }
-                        $badfiles++;
-                        }
-                elsif ($verbose)
-                        { print "Hash Check OK for $file\n";}
-                }
-                
-
-        if ($badfiles && !$rebuild)
-                {
-                print STDERR "FATAL: hash mismatch on $badfiles files\n";
-                fatal_error();
-                return 1;
-                }
-
-        if ($badfiles || $force_rewrite)
-                {
-                print "Updating Hash file $hash_file\n";
-                if (!open(OUT, ">$hash_file"))
-                        {
-                        print STDERR "Error rewriting $hash_file";
-                        return 1;
-                        }
-                print OUT "const char * const FIPS_source_hashes[] = {\n";
-                foreach (@hashed_files)
-                        {
-                        print OUT "\"HMAC-SHA1($_)= $hashes{$_}\",\n";
-                        }
-                print OUT "};\n";
-                close OUT;
-                }
-
-        if (!$badfiles)
-                {
-                print "FIPS hash check successful\n";
-                }
-
-        return 0;
-
-        }
-
-
-sub fatal_error
-        {
-        print STDERR "*** Your source code does not match the FIPS validated source ***\n";
-        }
-
-
diff --git a/src/lib/libcrypto/util/copy.pl b/src/lib/libcrypto/util/copy.pl
new file mode 100644
index 0000000000..e20b45530a
--- /dev/null
+++ b/src/lib/libcrypto/util/copy.pl
@@ -0,0 +1,59 @@
+#!/usr/local/bin/perl
+
+use Fcntl;
+
+
+# copy.pl
+
+# Perl script 'copy' comment. On Windows the built in "copy" command also
+# copies timestamps: this messes up Makefile dependencies.
+
+my $arg;
+
+foreach $arg (@ARGV) {
+        $arg =~ s|\\|/|g;       # compensate for bug/feature in cygwin glob...
+        foreach (glob $arg)
+                {
+                push @filelist, $_;
+                }
+}
+
+$fnum = @filelist;
+
+if ($fnum <= 1)
+        {
+        die "Need at least two filenames";
+        }
+
+$dest = pop @filelist;
+        
+if ($fnum > 2 && ! -d $dest)
+        {
+        die "Destination must be a directory";
+        }
+
+foreach (@filelist)
+        {
+        if (-d $dest)
+                {
+                $dfile = $_;
+                $dfile =~ s|^.*[/\\]([^/\\]*)$|$1|;
+                $dfile = "$dest/$dfile";
+                }
+        else
+                {
+                $dfile = $dest;
+                }
+        sysopen(IN, $_, O_RDONLY|O_BINARY) || die "Can't Open $_";
+        sysopen(OUT, $dfile, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY)
+                                        || die "Can't Open $dfile";
+        while (sysread IN, $buf, 10240)
+                {
+                syswrite(OUT, $buf, length($buf));
+                }
+        close(IN);
+        close(OUT);
+        print "Copying: $_ to $dfile\n";
+        }
+                
+
diff --git a/src/lib/libcrypto/util/extract-section.pl b/src/lib/libcrypto/util/extract-section.pl
new file mode 100644
index 0000000000..7a0ba4f69a
--- /dev/null
+++ b/src/lib/libcrypto/util/extract-section.pl
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+while(<STDIN>) {
+        if (/=for\s+comment\s+openssl_manual_section:(\S+)/)
+                {
+                print "$1\n";
+                exit 0;
+                }
+}
+
+print "$ARGV[0]\n";
+
diff --git a/src/lib/libcrypto/util/fipslink.pl b/src/lib/libcrypto/util/fipslink.pl
deleted file mode 100644
index 3597bc1740..0000000000
--- a/src/lib/libcrypto/util/fipslink.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/perl
-
-sub check_env
-        {
-        my @ret;
-        foreach (@_)
-                {
-                die "Environment variable $_ not defined!\n" unless exists $ENV{$_};
-                push @ret, $ENV{$_};
-                }
-        return @ret;
-        }
-
-
-my ($fips_cc,$fips_cc_args, $fips_link,$fips_target, $fips_libdir, $sha1_exe)
-         = check_env("FIPS_CC", "FIPS_CC_ARGS", "FIPS_LINK", "FIPS_TARGET",
-                "FIPSLIB_D", "FIPS_SHA1_EXE");
-
-
-
-if (exists $ENV{"PREMAIN_DSO_EXE"})
-        {
-        $fips_premain_dso = $ENV{"PREMAIN_DSO_EXE"};
-        }
-        else
-        {
-        $fips_premain_dso = "";
-        }
-
-check_hash($sha1_exe, "fips_premain.c");
-check_hash($sha1_exe, "fipscanister.lib");
-
-
-print "Integrity check OK\n";
-
-print "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c\n";
-system "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c";
-die "First stage Compile failure" if $? != 0;
-
-print "$fips_link @ARGV\n";
-system "$fips_link @ARGV";
-die "First stage Link failure" if $? != 0;
-
-
-print "$fips_premain_dso $fips_target\n";
-$fips_hash=`$fips_premain_dso $fips_target`;
-chomp $fips_hash;
-die "Get hash failure" if $? != 0;
-
-
-print "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fips_premain.c\n";
-system "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fips_premain.c";
-die "Second stage Compile failure" if $? != 0;
-
-
-print "$fips_link @ARGV\n";
-system "$fips_link @ARGV";
-die "Second stage Link failure" if $? != 0;
-
-sub check_hash
-        {
-        my ($sha1_exe, $filename) = @_;
-        my ($hashfile, $hashval);
-
-        open(IN, "${fips_libdir}/${filename}.sha1") || die "Cannot open file hash file ${fips_libdir}/${filename}.sha1";
-        $hashfile = <IN>;
-        close IN;
-        $hashval = `$sha1_exe ${fips_libdir}/$filename`;
-        chomp $hashfile;
-        chomp $hashval;
-        $hashfile =~ s/^.*=\s+//;
-        $hashval =~ s/^.*=\s+//;
-        die "Invalid hash syntax in file" if (length($hashfile) != 40);
-        die "Invalid hash received for file" if (length($hashval) != 40);
-        die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile); 
-        }
-
-
diff --git a/src/lib/libcrypto/util/mkrc.pl b/src/lib/libcrypto/util/mkrc.pl
new file mode 100755
index 0000000000..0ceadcf8d1
--- /dev/null
+++ b/src/lib/libcrypto/util/mkrc.pl
@@ -0,0 +1,71 @@
+#!/bin/env perl
+#
+open FD,"crypto/opensslv.h";
+while(<FD>) {
+    if (/OPENSSL_VERSION_NUMBER\s+(0x[0-9a-f]+)/i) {
+        $ver = hex($1);
+        $v1 = ($ver>>28);
+        $v2 = ($ver>>20)&0xff;
+        $v3 = ($ver>>12)&0xff;
+        $v4 = ($ver>> 4)&0xff;
+        $beta = $ver&0xf;
+        $version = "$v1.$v2.$v3";
+        if ($beta==0xf) { $version .= chr(ord('a')+$v4-1) if ($v4);     }
+        elsif ($beta==0){ $version .= "-dev";                           }
+        else            { $version .= "-beta$beta";                     }
+        last;
+    }
+}
+close(FD);
+
+$filename = $ARGV[0]; $filename =~ /(.*)\.([^.]+)$/;
+$basename = $1;
+$extname  = $2;
+
+if ($extname =~ /dll/i) { $description = "OpenSSL shared library"; }
+else                    { $description = "OpenSSL application";    }
+
+print <<___;
+#include <winver.h>
+
+LANGUAGE 0x09,0x01
+
+1 VERSIONINFO
+  FILEVERSION $v1,$v2,$v3,$v4
+  PRODUCTVERSION $v1,$v2,$v3,$v4
+  FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+  FILEFLAGS 0x01L
+#else
+  FILEFLAGS 0x00L
+#endif
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            // Required:
+            VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0"
+            VALUE "FileDescription", "$description\\0"
+            VALUE "FileVersion", "$version\\0"
+            VALUE "InternalName", "$basename\\0"
+            VALUE "OriginalFilename", "$filename\\0"
+            VALUE "ProductName", "The OpenSSL Toolkit\\0"
+            VALUE "ProductVersion", "$version\\0"
+            // Optional:
+            //VALUE "Comments", "\\0"
+            VALUE "LegalCopyright", "Copyright © 1998-2006 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
+            //VALUE "LegalTrademarks", "\\0"
+            //VALUE "PrivateBuild", "\\0"
+            //VALUE "SpecialBuild", "\\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 0x4b0
+    END
+END
+___
diff --git a/src/lib/libcrypto/util/mksdef.pl b/src/lib/libcrypto/util/mksdef.pl
deleted file mode 100644
index 065dc675f1..0000000000
--- a/src/lib/libcrypto/util/mksdef.pl
+++ /dev/null
@@ -1,87 +0,0 @@
-
-# Perl script to split libeay32.def into two distinct DEF files for use in
-# fipdso mode. It works out symbols in each case by running "link" command and
-# parsing the output to find the list of missing symbols then splitting
-# libeay32.def based on the result.
-
-
-# Get list of unknown symbols
-
-my @deferr = `link @ARGV`;
-
-my $preamble = "";
-my @fipsdll;
-my @fipsrest;
-my %nosym;
-
-# Add symbols to a hash for easy lookup
-
-foreach (@deferr)
-        {
-        if (/^.*symbol (\S+)$/)
-                {
-                $nosym{$1} = 1;
-                }
-        }
-
-open (IN, "ms/libeay32.def") || die "Can't Open DEF file for spliting";
-
-my $started = 0;
-
-# Parse libeay32.def into two arrays depending on whether the symbol matches
-# the missing list.
-
-
-foreach (<IN>)
-        {
-        if (/^\s*(\S+)\s*(\@\S+)\s*$/)
-                {
-                $started = 1;
-                if (exists $nosym{$1})
-                        {
-                        push @fipsrest, $_;
-                        }
-                else
-                        {
-                        my $imptmp = sprintf "     %-39s %s\n",
-                                        "$1=libosslfips.$1", $2;
-                        push @fipsrest, $imptmp;
-                        push @fipsdll, "\t$1\n";
-                        }
-                }
-        $preamble .= $_ unless $started;
-        }
-
-close IN;
-
-# Hack! Add some additional exports needed for libcryptofips.dll
-#
-
-push @fipsdll, "\tOPENSSL_showfatal\n";
-push @fipsdll, "\tOPENSSL_cpuid_setup\n";
-
-# Write out DEF files for each array
-
-write_def("ms/libosslfips.def", "LIBOSSLFIPS", $preamble, \@fipsdll);
-write_def("ms/libeayfips.def", "", $preamble, \@fipsrest);
-
-
-sub write_def
-        {
-        my ($fnam, $defname, $preamble, $rdefs) = @_;
-        open (OUT, ">$fnam") || die "Can't Open DEF file $fnam for Writing\n";
-
-        if ($defname ne "")
-                {
-                $preamble =~ s/LIBEAY32/$defname/g;
-                $preamble =~ s/LIBEAY/$defname/g;
-                }
-        print OUT $preamble;
-        foreach (@$rdefs)
-                {
-                print OUT $_;
-                }
-        close OUT;
-        }
-
-
diff --git a/src/lib/libcrypto/util/pl/BC-16.pl b/src/lib/libcrypto/util/pl/BC-16.pl
deleted file mode 100644
index 8030653daa..0000000000
--- a/src/lib/libcrypto/util/pl/BC-16.pl
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/local/bin/perl
-# VCw16lib.pl - the file for Visual C++ 1.52b for windows, static libraries
-#
-
-$o='\\';
-$cp='copy';
-$rm='del';
-
-# C compiler stuff
-$cc='bcc';
-
-if ($debug)
-        { $op="-v "; }
-else    { $op="-O "; }
-
-$cflags="-d -ml $op -DL_ENDIAN";
-# I add the stack opt
-$base_lflags="/c /C";
-$lflags="$base_lflags";
-
-if ($win16)
-        {
-        $shlib=1;
-        $cflags.=" -DOPENSSL_SYSNAME_WIN16";
-        $app_cflag="-W";
-        $lib_cflag="-WD";
-        $lflags.="/Twe";
-        }
-else
-        {
-        $cflags.=" -DOENSSL_SYSNAME_MSDOS";
-        $lflags.=" /Tde";
-        }
-
-if ($shlib)
-        {
-        $mlflags=" /Twd $base_lflags"; # stack if defined in .def file
-        $libs="libw ldllcew";
-        $no_asm=1;
-        }
-else
-        { $mlflags=''; }
-
-$obj='.obj';
-$ofile="-o";
-
-# EXE linking stuff
-$link="tlink";
-$efile="";
-$exep='.exe';
-$ex_libs="CL";
-$ex_libs.=$no_sock?"":" winsock.lib";
-
-$app_ex_obj="C0L.obj ";
-$shlib_ex_obj="" if ($shlib);
-
-# static library stuff
-$mklib='tlib';
-$ranlib='echo no ranlib';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='';
-
-$asm='bcc -c -B -Tml';
-$afile='/o';
-if ($no_asm || $fips)
-        {
-        $bn_asm_obj='';
-        $bn_asm_src='';
-        }
-elsif ($asmbits == 32)
-        {
-        $bn_asm_obj='crypto\bn\asm\x86w32.obj';
-        $bn_asm_src='crypto\bn\asm\x86w32.asm';
-        }
-else
-        {
-        $bn_asm_obj='crypto\bn\asm\x86w16.obj';
-        $bn_asm_src='crypto\bn\asm\x86w16.asm';
-        }
-
-sub do_lib_rule
-        {
-        local($target,$name,$shlib)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-
-        $ret.="$target: \$(${Name}OBJ)\n";
-        $ret.="\t\$(RM) \$(O_$Name)\n";
-
-        # Due to a pathetic line length limit, I unwrap the args.
-        local($lib_names)="";
-        local($dll_names)="";
-        foreach $_ (sort split(/\s+/,$Vars{"${Name}OBJ"}))
-                {
-                $lib_names.="  +$_ &\n";
-                $dll_names.="  $_\n";
-                }
-
-        if (!$shlib)
-                {
-                $ret.="\t\$(MKLIB) $target & <<|\n$lib_names\n,\n|\n";
-                }
-        else
-                {
-                local($ex)=($Name eq "SSL")?' $(L_CRYPTO) winsock':"";
-                $ret.="\t\$(LINK) \$(MLFLAGS) @&&|\n";
-                $ret.=$dll_names;
-                $ret.="\n  $target\n\n  $ex $libs\nms$o${name}16.def;\n|\n";
-                ($out_lib=$target) =~ s/O_/L_/;
-                $ret.="\timplib /nowep $out_lib $target\n\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
-        local($ret,$f,$_,@f);
-
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($target);
-        $ret.="$target: $files $dep_libs\n";
-        $ret.="  \$(LINK) @&&|";
-        
-        # Due to a pathetic line length limit, I have to unwrap the args.
-        $ret.=" \$(LFLAGS) ";
-        if ($files =~ /\(([^)]*)\)$/)
-                {
-                $ret.=" \$(APP_EX_OBJ)";
-                foreach $_ (sort split(/\s+/,$Vars{$1}))
-                        { $ret.="\n  $r $_ +"; }
-                chop($ret);
-                $ret.="\n";
-                }
-        else
-                { $ret.="\n $r \$(APP_EX_OBJ) $files\n"; }
-        $ret.="  $target\n\n  $libs\n\n|\n";
-        if (defined $sha1file)
-                {
-                $ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-1;
diff --git a/src/lib/libcrypto/util/pl/VC-16.pl b/src/lib/libcrypto/util/pl/VC-16.pl
deleted file mode 100644
index 564ba3fd08..0000000000
--- a/src/lib/libcrypto/util/pl/VC-16.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/local/bin/perl
-# VCw16lib.pl - the file for Visual C++ 1.52b for windows, static libraries
-#
-
-$ssl=   "ssleay16";
-$crypto="libeay16";
-
-$o='\\';
-$cp='copy';
-$rm='del';
-
-# C compiler stuff
-$cc='cl';
-
-$out_def="out16";
-$tmp_def="tmp16";
-$inc_def="inc16";
-
-if ($debug)
-        {
-        $op="/Od /Zi /Zd";
-        $base_lflags="/CO";
-        }
-else    {
-        $op="/G2 /f- /Ocgnotb2";
-        }
-$base_lflags.=" /FARCALL /NOLOGO /NOD /SEG:1024 /ONERROR:NOEXE /NOE /PACKC:60000";
-if ($win16) { $base_lflags.=" /PACKD:60000"; }
-
-$cflags="/ALw /Gx- /Gt256 /Gf $op /W3 /WX -DL_ENDIAN /nologo";
-# I add the stack opt
-$lflags="$base_lflags /STACK:20000";
-
-if ($win16)
-        {
-        $cflags.=" -DOPENSSL_SYSNAME_WIN16";
-        $app_cflag="/Gw /FPi87";
-        $lib_cflag="/Gw";
-        $lib_cflag.=" -D_WINDLL -D_DLL" if $shlib;
-        $lib_cflag.=" -DWIN16TTY" if !$shlib;
-        $lflags.=" /ALIGN:256";
-        $ex_libs.="oldnames llibcewq libw";
-        }
-else
-        {
-        $no_sock=1;
-        $cflags.=" -DMSDOS";
-        $lflags.=" /EXEPACK";
-        $ex_libs.="oldnames.lib llibce.lib";
-        }
-
-if ($shlib)
-        {
-        $mlflags="$base_lflags";
-        $libs="oldnames ldllcew libw";
-        $shlib_ex_obj="";
-#       $no_asm=1;
-        $out_def="out16dll";
-        $tmp_def="tmp16dll";
-        }
-else
-        { $mlflags=''; }
-
-$app_ex_obj="";
-
-$obj='.obj';
-$ofile="/Fo";
-
-# EXE linking stuff
-$link="link";
-$efile="";
-$exep='.exe';
-$ex_libs.=$no_sock?"":" winsock";
-
-# static library stuff
-$mklib='lib /PAGESIZE:1024';
-$ranlib='';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='';
-
-$asm='ml /Cp /c /Cx';
-$afile='/Fo';
-
-$bn_asm_obj='';
-$bn_asm_src='';
-$des_enc_obj='';
-$des_enc_src='';
-$bf_enc_obj='';
-$bf_enc_src='';
-
-if (!$no_asm && !$fips)
-        {
-        if ($asmbits == 32)
-                {
-                $bn_asm_obj='crypto\bn\asm\x86w32.obj';
-                $bn_asm_src='crypto\bn\asm\x86w32.asm';
-                }
-        else
-                {
-                $bn_asm_obj='crypto\bn\asm\x86w16.obj';
-                $bn_asm_src='crypto\bn\asm\x86w16.asm';
-                }
-        }
-
-sub do_lib_rule
-        {
-        local($objs,$target,$name,$shlib)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-
-#       $target="\$(LIB_D)$o$target";
-        $ret.="$target: $objs\n";
-#       $ret.="\t\$(RM) \$(O_$Name)\n";
-
-        # Due to a pathetic line length limit, I unwrap the args.
-        local($lib_names)="";
-        local($dll_names)="  \$(SHLIB_EX_OBJ) +\n";
-        ($obj)= ($objs =~ /\((.*)\)/);
-        foreach $_ (sort split(/\s+/,$Vars{$obj}))
-                {
-                $lib_names.="+$_ &\n";
-                $dll_names.="  $_ +\n";
-                }
-
-        if (!$shlib)
-                {
-                $ret.="\tdel $target\n";
-                $ret.="\t\$(MKLIB) @<<\n$target\ny\n$lib_names\n\n<<\n";
-                }
-        else
-                {
-                local($ex)=($target =~ /O_SSL/)?'$(L_CRYPTO)':"";
-                $ex.=' winsock';
-                $ret.="\t\$(LINK) \$(MLFLAGS) @<<\n";
-                $ret.=$dll_names;
-                $ret.="\n  $target\n\n  $ex $libs\nms$o${name}.def;\n<<\n";
-                ($out_lib=$target) =~ s/O_/L_/;
-                $ret.="\timplib /noignorecase /nowep $out_lib $target\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
-        local($ret,$f,$_,@f);
-        
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        $ret.="$target: $files $dep_libs\n";
-        $ret.="  \$(LINK) \$(LFLAGS) @<<\n";
-        
-        # Due to a pathetic line length limit, I have to unwrap the args.
-        if ($files =~ /\(([^)]*)\)$/)
-                {
-                @a=('$(APP_EX_OBJ)');
-                push(@a,sort split(/\s+/,$Vars{$1}));
-                for $_ (@a)
-                        { $ret.="  $_ +\n"; }
-                }
-        else
-                { $ret.="  \$(APP_EX_OBJ) $files"; }
-        $ret.="\n  $target\n\n  $libs\n\n<<\n";
-        if (defined $sha1file)
-                {
-                $ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-1;
diff --git a/src/lib/libcrypto/util/pl/VC-32-GMAKE.pl b/src/lib/libcrypto/util/pl/VC-32-GMAKE.pl
deleted file mode 100644
index b5bbcac6c2..0000000000
--- a/src/lib/libcrypto/util/pl/VC-32-GMAKE.pl
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/local/bin/perl
-# VCw32lib.pl - the file for Visual C++ 4.[01] for windows NT, static libraries
-#
-
-
-if ($fips && !$shlib)
-        {
-        $crypto="libeayfips32";
-        $crypto_compat = "libeaycompat32.lib";
-        }
-else
-        {
-        $crypto="libeay32";
-        }
-$ssl=   "ssleay32";
-
-$o='/';
-#$cp='copy nul+';       # Timestamps get stuffed otherwise
-#$rm='del';
-
-$cp='cp';
-$rm='rm';
-
-$zlib_lib="zlib1.lib";
-
-# C compiler stuff
-$cc='cl';
-$cflags=' -MD -W3 -WX -Ox -O2 -Ob2 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-$cflags.=' -D_CRT_SECURE_NO_DEPRECATE';         # shut up VC8
-$cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';        # shut up VC8
-$lflags="-nologo -subsystem:console -machine:I386 -opt:ref";
-$mlflags='';
-
-$out_def="gmout32";
-$tmp_def="gmtmp32";
-$inc_def="gminc32";
-
-if ($debug)
-        {
-        $cflags=" -MDd -W3 -WX -Zi -Yd -Od -nologo -DOPENSSL_SYSNAME_WIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
-        $lflags.=" -debug";
-        $mlflags.=' -debug';
-        }
-$cflags .= " -DOPENSSL_SYSNAME_WINNT" if $NT == 1;
-
-$obj='.obj';
-$ofile="-Fo";
-
-# EXE linking stuff
-$link="link";
-$efile="-out:";
-$exep='.exe';
-if ($no_sock)
-        { $ex_libs=""; }
-else    { $ex_libs="wsock32.lib user32.lib gdi32.lib"; }
-
-# static library stuff
-$mklib='lib';
-$ranlib='';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='-out:';
-
-$shlib_ex_obj="";
-$app_ex_obj="setargv.obj";
-if ($nasm) {
-        $asm='nasmw -f win32';
-        $afile='-o ';
-} else {
-        $asm='ml -Cp -coff -c -Cx';
-        $asm.=" -Zi" if $debug;
-        $afile='-Fo';
-}
-
-$bn_asm_obj='';
-$bn_asm_src='';
-$des_enc_obj='';
-$des_enc_src='';
-$bf_enc_obj='';
-$bf_enc_src='';
-
-if (!$no_asm && !$fips)
-        {
-        $bn_asm_obj='crypto/bn/asm/bn_win32.obj';
-        $bn_asm_src='crypto/bn/asm/bn_win32.asm';
-        $des_enc_obj='crypto/des/asm/d_win32.obj crypto/des/asm/y_win32.obj';
-        $des_enc_src='crypto/des/asm/d_win32.asm crypto/des/asm/y_win32.asm';
-        $bf_enc_obj='crypto/bf/asm/b_win32.obj';
-        $bf_enc_src='crypto/bf/asm/b_win32.asm';
-        $cast_enc_obj='crypto/cast/asm/c_win32.obj';
-        $cast_enc_src='crypto/cast/asm/c_win32.asm';
-        $rc4_enc_obj='crypto/rc4/asm/r4_win32.obj';
-        $rc4_enc_src='crypto/rc4/asm/r4_win32.asm';
-        $rc5_enc_obj='crypto/rc5/asm/r5_win32.obj';
-        $rc5_enc_src='crypto/rc5/asm/r5_win32.asm';
-        $md5_asm_obj='crypto/md5/asm/m5_win32.obj';
-        $md5_asm_src='crypto/md5/asm/m5_win32.asm';
-        $sha1_asm_obj='crypto/sha/asm/s1_win32.obj';
-        $sha1_asm_src='crypto/sha/asm/s1_win32.asm';
-        $rmd160_asm_obj='crypto/ripemd/asm/rm_win32.obj';
-        $rmd160_asm_src='crypto/ripemd/asm/rm_win32.asm';
-        $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
-        }
-
-if ($shlib)
-        {
-        $mlflags.=" $lflags -dll";
-#       $cflags =~ s| -MD| -MT|;
-        $lib_cflag=" -D_WINDLL";
-        $out_def="gmout32dll";
-        $tmp_def="gmtmp32dll";
-        }
-
-$cflags.=" -Fd$out_def";
-
-sub do_lib_rule
-        {
-        local($objs,$target,$name,$shlib,$ign,$base_addr, $fips_get_sig, $fips_premain_src)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-        my $base_arg;
-        if ($base_addr ne "")
-                {
-                $base_arg= " -base:$base_addr";
-                }
-        else
-                {
-                $base_arg = "";
-                }
-
-
-#       $target="\$(LIB_D)$o$target";
-        if (!$shlib)
-                {
-#               $ret.="\t\$(RM) \$(O_$Name)\n";
-                $ret.="$target: $objs\n";
-                $ex =' advapi32.lib';
-                $ret.="\t\$(MKLIB) $lfile$target $objs $ex\n\n";
-                }
-        else
-                {
-                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
-                $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
-                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
-                if (defined $fips_get_sig)
-                        {
-                        $ret.="$target: \$(O_FIPSCANISTER) $objs $fips_get_sig\n";
-                        $ret.="\tFIPS_LINK=\$(LINK) ";
-                        $ret.="FIPS_CC=\$(CC) ";
-                        $ret.="FIPS_CC_ARGS=\"-Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\" ";
-                        $ret.="FIPS_PREMAIN_DSO=$fips_get_sig ";
-                        $ret.="FIPS_TARGET=$target ";
-                        $ret.="FIPS_LIBDIR=\$(FIPSLIB_D) ";
-                        $ret.="\$(FIPSLINK) \$(MLFLAGS) $base_arg $efile$target ";
-                        $ret.="-def:ms/${Name}.def \$(SHLIB_EX_OBJ) $objs ";
-                        $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n\n";
-                        }
-                else
-                        {
-                        $ret.="$target: $objs\n";
-                        $ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def \$(SHLIB_EX_OBJ) $objs $ex\n\n";
-                        }
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$standalone)=@_;
-        local($ret,$_);
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        if ($standalone)
-                {
-                $ret.="$target: $files $dep_libs\n";
-                $ret.="\t\$(LINK) \$(LFLAGS) $efile$target ";
-                $ret.="$files $libs\n\n";
-                }
-        elsif ($fips && !$shlib)
-                {
-                $ret.="$target: \$(O_FIPSCANISTER) $files $dep_libs\n";
-                $ret.="\tFIPS_LINK=\$(LINK) ";
-                $ret.="FIPS_CC=\$(CC) ";
-                $ret.="FIPS_CC_ARGS=\"-Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\" ";
-                $ret.="FIPS_PREMAIN_DSO= ";
-                $ret.="FIPS_TARGET=$target ";
-                $ret.="FIPS_LIBDIR=\$(FIPSLIB_D) ";
-                $ret.=" \$(FIPSLINK) \$(LFLAGS) $efile$target ";
-                $ret.="\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n\n";
-                }
-        else
-                {
-                $ret.="$target: $files $dep_libs\n";
-                $ret.="\t\$(LINK) \$(LFLAGS) $efile$target ";
-                $ret.="\$(APP_EX_OBJ) $files $libs\n\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_rlink_rule
-        {
-        local($target,$files,$check_hash, $deps)=@_;
-        local($ret,$_);
-
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        $ret.="$target: $check_hash $files $deps\n";
-        $ret.="\t\$(PERL) util${o}checkhash.pl -chdir fips-1.0 -program_path ..$o$check_hash\n";
-        $ret.="\t\$(MKCANISTER) $target $files\n";
-        $ret.="\t$check_hash $target > $target.sha1\n";
-        $ret.="\t\$(CP) fips-1.0${o}fips_premain.c \$(FIPSLIB_D)\n";
-        $ret.="\t$check_hash \$(FIPSLIB_D)${o}fips_premain.c > \$(FIPSLIB_D)${o}fips_premain.c.sha1\n\n";
-        return($ret);
-        }
-
-
-1;
diff --git a/src/lib/libcrypto/util/pl/VC-CE.pl b/src/lib/libcrypto/util/pl/VC-CE.pl
deleted file mode 100644
index 2fd0c4dd32..0000000000
--- a/src/lib/libcrypto/util/pl/VC-CE.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/local/bin/perl
-# VC-CE.pl - the file for eMbedded Visual C++ 3.0 for windows CE, static libraries
-#
-
-$ssl=   "ssleay32";
-$crypto="libeay32";
-$RSAref="RSAref32";
-
-$o='\\';
-$cp='copy nul+';        # Timestamps get stuffed otherwise
-$rm='del';
-
-# C compiler stuff
-$cc='$(CC)';
-$cflags=' /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(WCETARGETDEFS) -DUNICODE -D_UNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include';
-$lflags='/nologo /subsystem:windowsce,$(WCELDVERSION) /machine:$(WCELDMACHINE) /opt:ref';
-$mlflags='';
-
-$out_def='out32_$(TARGETCPU)';
-$tmp_def='tmp32_$(TARGETCPU)';
-$inc_def="inc32";
-
-if ($debug)
-        {
-        $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
-        $lflags.=" /debug";
-        $mlflags.=' /debug';
-        }
-
-$obj='.obj';
-$ofile="/Fo";
-
-# EXE linking stuff
-$link="link";
-$efile="/out:";
-$exep='.exe';
-if ($no_sock)
-        { $ex_libs=""; }
-else    { $ex_libs='winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib $(WCELDFLAGS)'; }
-
-# static library stuff
-$mklib='lib';
-$ranlib='';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='/out:';
-
-$shlib_ex_obj="";
-$app_ex_obj="";
-$app_ex_obj="";
-
-$bn_asm_obj='';
-$bn_asm_src='';
-$des_enc_obj='';
-$des_enc_src='';
-$bf_enc_obj='';
-$bf_enc_src='';
-
-if ($shlib)
-        {
-        $mlflags.=" $lflags /dll";
-#       $cflags =~ s| /MD| /MT|;
-        $lib_cflag=" -D_WINDLL -D_DLL";
-        $out_def='out32dll_$(TARGETCPU)';
-        $tmp_def='tmp32dll_$(TARGETCPU)';
-        }
-
-$cflags.=" /Fd$out_def";
-
-sub do_lib_rule
-        {
-        local($objs,$target,$name,$shlib)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-
-#       $target="\$(LIB_D)$o$target";
-        $ret.="$target: $objs\n";
-        if (!$shlib)
-                {
-#               $ret.="\t\$(RM) \$(O_$Name)\n";
-                $ex =' ';
-                $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs $ex\n<<\n";
-                }
-        else
-                {
-                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
-#               $ex.=' winsock.lib coredll.lib $(WCECOMPAT)/lib/wcecompatex.lib';
-                $ex.=' winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib';
-                $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
-        local($ret,$_);
-        
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        $ret.="$target: $files $dep_libs\n";
-        $ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
-        $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
-        if (defined $sha1file)
-                {
-                $ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-1;
diff --git a/src/lib/libcrypto/util/pl/netware.pl b/src/lib/libcrypto/util/pl/netware.pl
new file mode 100644
index 0000000000..c78bcfc874
--- /dev/null
+++ b/src/lib/libcrypto/util/pl/netware.pl
@@ -0,0 +1,532 @@
+# Metrowerks Codewarrior or gcc / nlmconv for NetWare
+#
+
+$version_header = "crypto/opensslv.h";
+open(IN, "$version_header") or die "Couldn't open $version_header: $!";
+while (<IN>) {
+  if (/^#define[\s\t]+OPENSSL_VERSION_NUMBER[\s\t]+0x(\d)(\d{2})(\d{2})(\d{2})/)
+  {
+    # die "OpenSSL version detected: $1.$2.$3.$4\n";
+    #$nlmvernum = "$1,$2,$3";
+    $nlmvernum = "$1,".($2*10+$3).",".($4*1);
+    #$nlmverstr = "$1.".($2*1).".".($3*1).($4?(chr(96+$4)):"");
+    break;
+  }
+}
+close(IN) or die "Couldn't close $version_header: $!";
+
+$readme_file = "README";
+open(IN, $readme_file) or die "Couldn't open $readme_file: $!";
+while (<IN>) {
+  if (/^[\s\t]+OpenSSL[\s\t]+(\d)\.(\d{1,2})\.(\d{1,2})([a-z])(.*)/)
+  {
+    #$nlmvernum = "$1,$2,$3";
+    #$nlmvernum = "$1,".($2*10+$3).",".($4*1);
+    $nlmverstr = "$1.$2.$3$4$5";
+  }
+  elsif (/^[\s\t]+(Copyright \(c\) \d{4}\-\d{4} The OpenSSL Project)$/)
+  {
+    $nlmcpystr = $1;
+  }
+  break if ($nlmvernum && $nlmcpystr);
+}
+close(IN) or die "Couldn't close $readme_file: $!";
+
+# Define stacksize here
+$nlmstack = "32768";
+
+# some default settings here in case we failed to find them in README
+$nlmvernum = "1,0,0" if (!$nlmvernum);
+$nlmverstr = "OpenSSL" if (!$nlmverstr);
+$nlmcpystr = "Copyright (c) 1998-now The OpenSSL Project" if (!$nlmcpystr);
+
+# die "OpenSSL copyright: $nlmcpystr\nOpenSSL verstring: $nlmverstr\nOpenSSL vernumber: $nlmvernum\n";
+
+# The import files and other misc imports needed to link
+@misc_imports = ("GetProcessSwitchCount", "RunningProcess",
+                 "GetSuperHighResolutionTimer");
+if ($LIBC)
+{
+   @import_files = ("libc.imp");
+   @module_files = ("libc");
+   $libarch = "LIBC";
+}
+else
+{
+   # clib build
+   @import_files = ("clib.imp");
+   push(@import_files, "socklib.imp") if ($BSDSOCK);
+   @module_files = ("clib");
+   # push(@misc_imports, "_rt_modu64%16", "_rt_divu64%16");
+   $libarch = "CLIB";
+}
+if ($BSDSOCK)
+{
+   $libarch .= "-BSD";
+}
+else
+{
+   $libarch .= "-WS2";
+   push(@import_files, "ws2nlm.imp");
+}
+
+# The "IMPORTS" environment variable must be set and point to the location
+# where import files (*.imp) can be found.
+# Example:  set IMPORTS=c:\ndk\nwsdk\imports
+$import_path = $ENV{"IMPORTS"} || die ("IMPORTS environment variable not set\n");
+
+
+# The "PRELUDE" environment variable must be set and point to the location
+# and name of the prelude source to link with ( nwpre.obj is recommended ).
+# Example: set PRELUDE=c:\codewar\novell support\metrowerks support\libraries\runtime\nwpre.obj
+$prelude = $ENV{"PRELUDE"} || die ("PRELUDE environment variable not set\n");
+
+# The "INCLUDES" environment variable must be set and point to the location
+# where import files (*.imp) can be found.
+$include_path = $ENV{"INCLUDE"} || die ("INCLUDES environment variable not set\n");
+$include_path =~ s/\\/\//g;
+$include_path = join(" -I", split(/;/, $include_path));
+
+# check for gcc compiler
+$gnuc = $ENV{"GNUC"};
+
+#$ssl=   "ssleay32";
+#$crypto="libeay32";
+
+if ($gnuc)
+{
+   # C compiler
+   $cc='gcc';
+   # Linker
+   $link='nlmconv';
+   # librarian
+   $mklib='ar';
+   $o='/';
+   # cp command
+   $cp='cp -af';
+   # rm command
+   $rm='rm -f';
+   # mv command
+   $mv='mv -f';
+   # mkdir command
+   $mkdir='gmkdir';
+   #$ranlib='ranlib';
+}
+else
+{
+   # C compiler
+   $cc='mwccnlm';
+   # Linker
+   $link='mwldnlm';
+   # librarian
+   $mklib='mwldnlm';
+   # Path separator
+   $o='\\';
+   # cp command
+   $cp='copy >nul:';
+   # rm command
+   $rm='del /f /q';
+}
+
+# assembler
+if ($nw_nasm)
+{
+   $asm=(`nasm -v 2>NUL` gt `nasmw -v 2>NUL`?"nasm":"nasmw");
+   if ($gnuc)
+   {
+      $asm.=" -s -f elf";
+   }
+   else
+   {
+      $asm.=" -s -f coff -d __coff__";
+   }
+   $afile="-o ";
+   $asm.=" -g" if $debug;
+}
+elsif ($nw_mwasm)
+{
+   $asm="mwasmnlm -maxerrors 20";
+   $afile="-o ";
+   $asm.=" -g" if $debug;
+}
+elsif ($nw_masm)
+{
+# masm assembly settings - it should be possible to use masm but haven't
+# got it working.
+# $asm='ml /Cp /coff /c /Cx';
+# $asm.=" /Zi" if $debug;
+# $afile='/Fo';
+   die("Support for masm assembler not yet functional\n");
+}
+else
+{
+   $asm="";
+   $afile="";
+}
+
+
+
+if ($gnuc)
+{
+   # compile flags for GNUC
+   # additional flags based upon debug | non-debug
+   if ($debug)
+   {
+      $cflags="-g -DDEBUG";
+   }
+   else
+   {
+      $cflags="-O2";
+   }
+   $cflags.=" -nostdinc -I$include_path \\
+         -fno-builtin -fpcc-struct-return -fno-strict-aliasing \\
+         -funsigned-char -Wall -Wno-unused -Wno-uninitialized";
+
+   # link flags
+   $lflags="-T";
+}
+else
+{
+   # compile flags for CodeWarrior
+   # additional flags based upon debug | non-debug
+   if ($debug)
+   {
+      $cflags="-opt off -g -sym internal -DDEBUG";
+   }
+   else
+   {
+   # CodeWarrior compiler has a problem with optimizations for floating
+   # points - no optimizations until further investigation
+   #      $cflags="-opt all";
+   }
+
+   # NOTES: Several c files in the crypto subdirectory include headers from
+   #        their local directories.  Metrowerks wouldn't find these h files
+   #        without adding individual include directives as compile flags
+   #        or modifying the c files.  Instead of adding individual include
+   #        paths for each subdirectory a recursive include directive
+   #        is used ( -ir crypto ).
+   #
+   #        A similar issue exists for the engines and apps subdirectories.
+   #
+   #        Turned off the "possible" warnings ( -w nopossible ).  Metrowerks
+   #        complained a lot about various stuff.  May want to turn back
+   #        on for further development.
+   $cflags.=" -nostdinc -ir crypto -ir engines -ir apps -I$include_path \\
+         -msgstyle gcc -align 4 -processor pentium -char unsigned \\
+         -w on -w nolargeargs -w nopossible -w nounusedarg -w nounusedexpr \\
+         -w noimplicitconv -relax_pointers -nosyspath -maxerrors 20";
+
+   # link flags
+   $lflags="-msgstyle gcc -zerobss -nostdlib -sym internal -commandfile";
+}
+
+# common defines
+$cflags.=" -DL_ENDIAN -DOPENSSL_SYSNAME_NETWARE -U_WIN32";
+
+# If LibC build add in NKS_LIBC define and set the entry/exit
+# routines - The default entry/exit routines are for CLib and don't exist
+# in LibC
+if ($LIBC)
+{
+   $cflags.=" -DNETWARE_LIBC";
+   $nlmstart = "_LibCPrelude";
+   $nlmexit = "_LibCPostlude";
+   @nlm_flags = ("pseudopreemption", "flag_on 64");
+}
+else
+{
+   $cflags.=" -DNETWARE_CLIB";
+   $nlmstart = "_Prelude";
+   $nlmexit = "_Stop";
+}
+
+# If BSD Socket support is requested, set a define for the compiler
+if ($BSDSOCK)
+{
+   $cflags.=" -DNETWARE_BSDSOCK";
+   if (!$LIBC)
+   {
+      $cflags.=" -DNETDB_USE_INTERNET";
+   }
+}
+
+
+# linking stuff
+# for the output directories use the mk1mf.pl values with "_nw" appended
+if ($shlib)
+{
+   if ($LIBC)
+   {
+      $out_def.="_nw_libc_nlm";
+      $tmp_def.="_nw_libc_nlm";
+      $inc_def.="_nw_libc_nlm";
+   }
+   else  # NETWARE_CLIB
+   {
+      $out_def.="_nw_clib_nlm";
+      $tmp_def.="_nw_clib_nlm";
+      $inc_def.="_nw_clib_nlm";
+   }
+}
+else
+{
+   if ($gnuc) # GNUC Tools
+   {
+      $libp=".a";
+      $shlibp=".a";
+      $lib_flags="-cr";
+   }
+   else       # CodeWarrior
+   {
+      $libp=".lib";
+      $shlibp=".lib";
+      $lib_flags="-nodefaults -type library -o";
+   }
+   if ($LIBC)
+   {
+      $out_def.="_nw_libc";
+      $tmp_def.="_nw_libc";
+      $inc_def.="_nw_libc";
+   }
+   else  # NETWARE_CLIB
+   {
+      $out_def.="_nw_clib";
+      $tmp_def.="_nw_clib";
+      $inc_def.="_nw_clib";
+   }
+}
+
+# used by mk1mf.pl
+$obj='.o';
+$ofile='-o ';
+$efile='';
+$exep='.nlm';
+$ex_libs='';
+
+if (!$no_asm)
+{
+   $bn_asm_obj="\$(OBJ_D)${o}bn-nw${obj}";
+   $bn_asm_src="crypto${o}bn${o}asm${o}bn-nw.asm";
+   $bnco_asm_obj="\$(OBJ_D)${o}co-nw${obj}";
+   $bnco_asm_src="crypto${o}bn${o}asm${o}co-nw.asm";
+   $aes_asm_obj="\$(OBJ_D)${o}a-nw${obj}";
+   $aes_asm_src="crypto${o}aes${o}asm${o}a-nw.asm";
+   $des_enc_obj="\$(OBJ_D)${o}d-nw${obj} \$(OBJ_D)${o}y-nw${obj}";
+   $des_enc_src="crypto${o}des${o}asm${o}d-nw.asm crypto${o}des${o}asm${o}y-nw.asm";
+   $bf_enc_obj="\$(OBJ_D)${o}b-nw${obj}";
+   $bf_enc_src="crypto${o}bf${o}asm${o}b-nw.asm";
+   $cast_enc_obj="\$(OBJ_D)${o}c-nw${obj}";
+   $cast_enc_src="crypto${o}cast${o}asm${o}c-nw.asm";
+   $rc4_enc_obj="\$(OBJ_D)${o}r4-nw${obj}";
+   $rc4_enc_src="crypto${o}rc4${o}asm${o}r4-nw.asm";
+   $rc5_enc_obj="\$(OBJ_D)${o}r5-nw${obj}";
+   $rc5_enc_src="crypto${o}rc5${o}asm${o}r5-nw.asm";
+   $md5_asm_obj="\$(OBJ_D)${o}m5-nw${obj}";
+   $md5_asm_src="crypto${o}md5${o}asm${o}m5-nw.asm";
+   $sha1_asm_obj="\$(OBJ_D)${o}s1-nw${obj} \$(OBJ_D)${o}sha256-nw${obj} \$(OBJ_D)${o}sha512-nw${obj}";
+   $sha1_asm_src="crypto${o}sha${o}asm${o}s1-nw.asm crypto${o}sha${o}asm${o}sha256-nw.asm crypto${o}sha${o}asm${o}sha512-nw.asm";
+   $rmd160_asm_obj="\$(OBJ_D)${o}rm-nw${obj}";
+   $rmd160_asm_src="crypto${o}ripemd${o}asm${o}rm-nw.asm";
+   $whirlpool_asm_obj="\$(OBJ_D)${o}wp-nw${obj}";
+   $whirlpool_asm_src="crypto${o}whrlpool${o}asm${o}wp-nw.asm";
+   $cpuid_asm_obj="\$(OBJ_D)${o}x86cpuid-nw${obj}";
+   $cpuid_asm_src="crypto${o}x86cpuid-nw.asm";
+   $cflags.=" -DOPENSSL_CPUID_OBJ -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DWHIRLPOOL_ASM";
+   $cflags.=" -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM";
+   $cflags.=" -DAES_ASM -DRMD160_ASM";
+}
+else
+{
+   $bn_asm_obj='';
+   $bn_asm_src='';
+   $bnco_asm_obj='';
+   $bnco_asm_src='';
+   $aes_asm_obj='';
+   $aes_asm_src='';
+   $des_enc_obj='';
+   $des_enc_src='';
+   $bf_enc_obj='';
+   $bf_enc_src='';
+   $cast_enc_obj='';
+   $cast_enc_src='';
+   $rc4_enc_obj='';
+   $rc4_enc_src='';
+   $rc5_enc_obj='';
+   $rc5_enc_src='';
+   $md5_asm_obj='';
+   $md5_asm_src='';
+   $sha1_asm_obj='';
+   $sha1_asm_src='';
+   $rmd160_asm_obj='';
+   $rmd160_asm_src='';
+   $whirlpool_asm_obj='';
+   $whirlpool_asm_src='';
+   $cpuid_asm_obj='';
+   $cpuid_asm_src='';
+}
+
+# create the *.def linker command files in \openssl\netware\ directory
+sub do_def_file
+{
+   # strip off the leading path
+   my($target) = bname(shift);
+   my($i);
+
+   if ($target =~ /(.*).nlm/)
+   {
+      $target = $1;
+   }
+
+   # special case for openssl - the mk1mf.pl defines E_EXE = openssl
+   if ($target =~ /E_EXE/)
+   {
+      $target =~ s/\$\(E_EXE\)/openssl/;
+   }
+
+   # Note: originally tried to use full path ( \openssl\netware\$target.def )
+   # Metrowerks linker choked on this with an assertion failure. bug???
+   #
+   my($def_file) = "netware${o}$target.def";
+
+   open(DEF_OUT, ">$def_file") || die("unable to open file $def_file\n");
+
+   print( DEF_OUT "# command file generated by netware.pl for NLM target.\n" );
+   print( DEF_OUT "# do not edit this file - all your changes will be lost!!\n" );
+   print( DEF_OUT "#\n");
+   print( DEF_OUT "DESCRIPTION \"$target ($libarch) - OpenSSL $nlmverstr\"\n");
+   print( DEF_OUT "COPYRIGHT \"$nlmcpystr\"\n");
+   print( DEF_OUT "VERSION $nlmvernum\n");
+   print( DEF_OUT "STACK $nlmstack\n");
+   print( DEF_OUT "START $nlmstart\n");
+   print( DEF_OUT "EXIT $nlmexit\n");
+
+   # special case for openssl
+   if ($target eq "openssl")
+   {
+      print( DEF_OUT "SCREENNAME \"OpenSSL $nlmverstr\"\n");
+   }
+   else
+   {
+      print( DEF_OUT "SCREENNAME \"DEFAULT\"\n");
+   }
+
+   foreach $i (@misc_imports)
+   {
+      print( DEF_OUT "IMPORT $i\n");
+   }
+
+   foreach $i (@import_files)
+   {
+      print( DEF_OUT "IMPORT \@$import_path${o}$i\n");
+   }
+
+   foreach $i (@module_files)
+   {
+      print( DEF_OUT "MODULE $i\n");
+   }
+
+   foreach $i (@nlm_flags)
+   {
+      print( DEF_OUT "$i\n");
+   }
+
+   if ($gnuc)
+   {
+      if ($target =~ /openssl/)
+      {
+         print( DEF_OUT "INPUT ${tmp_def}${o}openssl${obj}\n");
+         print( DEF_OUT "INPUT ${tmp_def}${o}openssl${libp}\n");
+      }
+      else
+      {
+         print( DEF_OUT "INPUT ${tmp_def}${o}${target}${obj}\n");
+      }
+      print( DEF_OUT "INPUT $prelude\n");
+      print( DEF_OUT "INPUT ${out_def}${o}${ssl}${libp} ${out_def}${o}${crypto}${libp}\n");
+      print( DEF_OUT "OUTPUT $target.nlm\n");
+   }
+
+   close(DEF_OUT);
+   return($def_file);
+}
+
+sub do_lib_rule
+{
+   my($objs,$target,$name,$shlib)=@_;
+   my($ret);
+
+   $ret.="$target: $objs\n";
+   if (!$shlib)
+   {
+      $ret.="\t\@echo Building Lib: $name\n";
+      $ret.="\t\$(MKLIB) $lib_flags $target $objs\n";
+      $ret.="\t\@echo .\n"
+   }
+   else
+   {
+      die( "Building as NLM not currently supported!" );
+   }
+
+   $ret.="\n";
+   return($ret);
+}
+
+sub do_link_rule
+{
+   my($target,$files,$dep_libs,$libs)=@_;
+   my($ret);
+   my($def_file) = do_def_file($target);
+
+   $ret.="$target: $files $dep_libs\n";
+
+   # NOTE:  When building the test nlms no screen name is given
+   #  which causes the console screen to be used.  By using the console
+   #  screen there is no "<press any key to continue>" message which
+   #  requires user interaction.  The test script ( do_tests.pl ) needs
+   #  to be able to run the tests without requiring user interaction.
+   #
+   #  However, the sample program "openssl.nlm" is used by the tests and is
+   #  a interactive sample so a screen is desired when not be run by the
+   #  tests.  To solve the problem, two versions of the program are built:
+   #    openssl2 - no screen used by tests
+   #    openssl - default screen - use for normal interactive modes
+   #
+
+   # special case for openssl - the mk1mf.pl defines E_EXE = openssl
+   if ($target =~ /E_EXE/)
+   {
+      my($target2) = $target;
+
+      $target2 =~ s/\(E_EXE\)/\(E_EXE\)2/;
+
+      # openssl2
+      my($def_file2) = do_def_file($target2);
+
+      if ($gnuc)
+      {
+         $ret.="\t\$(MKLIB) $lib_flags \$(TMP_D)${o}\$(E_EXE).a \$(filter-out \$(TMP_D)${o}\$(E_EXE)${obj},$files)\n";
+         $ret.="\t\$(LINK) \$(LFLAGS) $def_file2\n";
+         $ret.="\t\@$mv \$(E_EXE)2.nlm \$(TEST_D)\n";
+      }
+      else
+      {
+         $ret.="\t\$(LINK) \$(LFLAGS) $def_file2 $files \"$prelude\" $libs -o $target2\n";
+      }
+   }
+   if ($gnuc)
+   {
+      $ret.="\t\$(LINK) \$(LFLAGS) $def_file\n";
+      $ret.="\t\@$mv \$(\@F) \$(TEST_D)\n";
+   }
+   else
+   {
+      $ret.="\t\$(LINK) \$(LFLAGS) $def_file $files \"$prelude\" $libs -o $target\n";
+   }
+
+   $ret.="\n";
+   return($ret);
+
+}
+
+1;
diff --git a/src/lib/libcrypto/whrlpool/Makefile b/src/lib/libcrypto/whrlpool/Makefile
new file mode 100644
index 0000000000..566b996290
--- /dev/null
+++ b/src/lib/libcrypto/whrlpool/Makefile
@@ -0,0 +1,93 @@
+#
+# crypto/whrlpool/Makefile
+#
+
+DIR=    whrlpool
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+WP_ASM_OBJ=wp_block.o
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG)
+AFLAGS= $(ASFLAGS)
+
+GENERAL=Makefile
+TEST=wp_test.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=wp_dgst.c wp_block.c
+LIBOBJ=wp_dgst.o $(WP_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= whrlpool.h
+HEADER= wp_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+wp-mmx.s:       asm/wp-mmx.pl ../perlasm/x86asm.pl
+        $(PERL) asm/wp-mmx.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+
+wp-x86_64.s: asm/wp-x86_64.pl
+        $(PERL) asm/wp-x86_64.pl $(PERLASM_SCHEME) > $@
+
+$(LIBOBJ): $(LIBSRC)
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+wp_block.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+wp_block.o: ../../include/openssl/whrlpool.h wp_block.c wp_locl.h
+wp_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+wp_dgst.o: ../../include/openssl/whrlpool.h wp_dgst.c wp_locl.h
diff --git a/src/lib/libcrypto/whrlpool/wp_test.c b/src/lib/libcrypto/whrlpool/wp_test.c
new file mode 100644
index 0000000000..c68c2c62ca
--- /dev/null
+++ b/src/lib/libcrypto/whrlpool/wp_test.c
@@ -0,0 +1,228 @@
+/* ====================================================================
+ * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
+ * ====================================================================
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <openssl/whrlpool.h>
+#include <openssl/crypto.h>
+
+#if defined(OPENSSL_NO_WHIRLPOOL)
+int main(int argc, char *argv[])
+{
+    printf("No Whirlpool support\n");
+    return(0);
+}
+#else
+
+/* ISO/IEC 10118-3 test vector set */
+unsigned char iso_test_1[WHIRLPOOL_DIGEST_LENGTH] = {
+        0x19,0xFA,0x61,0xD7,0x55,0x22,0xA4,0x66,
+        0x9B,0x44,0xE3,0x9C,0x1D,0x2E,0x17,0x26,
+        0xC5,0x30,0x23,0x21,0x30,0xD4,0x07,0xF8,
+        0x9A,0xFE,0xE0,0x96,0x49,0x97,0xF7,0xA7,
+        0x3E,0x83,0xBE,0x69,0x8B,0x28,0x8F,0xEB,
+        0xCF,0x88,0xE3,0xE0,0x3C,0x4F,0x07,0x57,
+        0xEA,0x89,0x64,0xE5,0x9B,0x63,0xD9,0x37,
+        0x08,0xB1,0x38,0xCC,0x42,0xA6,0x6E,0xB3 };
+
+unsigned char iso_test_2[WHIRLPOOL_DIGEST_LENGTH] = {
+        0x8A,0xCA,0x26,0x02,0x79,0x2A,0xEC,0x6F,
+        0x11,0xA6,0x72,0x06,0x53,0x1F,0xB7,0xD7,
+        0xF0,0xDF,0xF5,0x94,0x13,0x14,0x5E,0x69,
+        0x73,0xC4,0x50,0x01,0xD0,0x08,0x7B,0x42,
+        0xD1,0x1B,0xC6,0x45,0x41,0x3A,0xEF,0xF6,
+        0x3A,0x42,0x39,0x1A,0x39,0x14,0x5A,0x59,
+        0x1A,0x92,0x20,0x0D,0x56,0x01,0x95,0xE5,
+        0x3B,0x47,0x85,0x84,0xFD,0xAE,0x23,0x1A };
+
+unsigned char iso_test_3[WHIRLPOOL_DIGEST_LENGTH] = {
+        0x4E,0x24,0x48,0xA4,0xC6,0xF4,0x86,0xBB,
+        0x16,0xB6,0x56,0x2C,0x73,0xB4,0x02,0x0B,
+        0xF3,0x04,0x3E,0x3A,0x73,0x1B,0xCE,0x72,
+        0x1A,0xE1,0xB3,0x03,0xD9,0x7E,0x6D,0x4C,
+        0x71,0x81,0xEE,0xBD,0xB6,0xC5,0x7E,0x27,
+        0x7D,0x0E,0x34,0x95,0x71,0x14,0xCB,0xD6,
+        0xC7,0x97,0xFC,0x9D,0x95,0xD8,0xB5,0x82,
+        0xD2,0x25,0x29,0x20,0x76,0xD4,0xEE,0xF5 };
+
+unsigned char iso_test_4[WHIRLPOOL_DIGEST_LENGTH] = {
+        0x37,0x8C,0x84,0xA4,0x12,0x6E,0x2D,0xC6,
+        0xE5,0x6D,0xCC,0x74,0x58,0x37,0x7A,0xAC,
+        0x83,0x8D,0x00,0x03,0x22,0x30,0xF5,0x3C,
+        0xE1,0xF5,0x70,0x0C,0x0F,0xFB,0x4D,0x3B,
+        0x84,0x21,0x55,0x76,0x59,0xEF,0x55,0xC1,
+        0x06,0xB4,0xB5,0x2A,0xC5,0xA4,0xAA,0xA6,
+        0x92,0xED,0x92,0x00,0x52,0x83,0x8F,0x33,
+        0x62,0xE8,0x6D,0xBD,0x37,0xA8,0x90,0x3E };
+
+unsigned char iso_test_5[WHIRLPOOL_DIGEST_LENGTH] = {
+        0xF1,0xD7,0x54,0x66,0x26,0x36,0xFF,0xE9,
+        0x2C,0x82,0xEB,0xB9,0x21,0x2A,0x48,0x4A,
+        0x8D,0x38,0x63,0x1E,0xAD,0x42,0x38,0xF5,
+        0x44,0x2E,0xE1,0x3B,0x80,0x54,0xE4,0x1B,
+        0x08,0xBF,0x2A,0x92,0x51,0xC3,0x0B,0x6A,
+        0x0B,0x8A,0xAE,0x86,0x17,0x7A,0xB4,0xA6,
+        0xF6,0x8F,0x67,0x3E,0x72,0x07,0x86,0x5D,
+        0x5D,0x98,0x19,0xA3,0xDB,0xA4,0xEB,0x3B };
+
+unsigned char iso_test_6[WHIRLPOOL_DIGEST_LENGTH] = {
+        0xDC,0x37,0xE0,0x08,0xCF,0x9E,0xE6,0x9B,
+        0xF1,0x1F,0x00,0xED,0x9A,0xBA,0x26,0x90,
+        0x1D,0xD7,0xC2,0x8C,0xDE,0xC0,0x66,0xCC,
+        0x6A,0xF4,0x2E,0x40,0xF8,0x2F,0x3A,0x1E,
+        0x08,0xEB,0xA2,0x66,0x29,0x12,0x9D,0x8F,
+        0xB7,0xCB,0x57,0x21,0x1B,0x92,0x81,0xA6,
+        0x55,0x17,0xCC,0x87,0x9D,0x7B,0x96,0x21,
+        0x42,0xC6,0x5F,0x5A,0x7A,0xF0,0x14,0x67 };
+
+unsigned char iso_test_7[WHIRLPOOL_DIGEST_LENGTH] = {
+        0x46,0x6E,0xF1,0x8B,0xAB,0xB0,0x15,0x4D,
+        0x25,0xB9,0xD3,0x8A,0x64,0x14,0xF5,0xC0,
+        0x87,0x84,0x37,0x2B,0xCC,0xB2,0x04,0xD6,
+        0x54,0x9C,0x4A,0xFA,0xDB,0x60,0x14,0x29,
+        0x4D,0x5B,0xD8,0xDF,0x2A,0x6C,0x44,0xE5,
+        0x38,0xCD,0x04,0x7B,0x26,0x81,0xA5,0x1A,
+        0x2C,0x60,0x48,0x1E,0x88,0xC5,0xA2,0x0B,
+        0x2C,0x2A,0x80,0xCF,0x3A,0x9A,0x08,0x3B };
+
+unsigned char iso_test_8[WHIRLPOOL_DIGEST_LENGTH] = {
+        0x2A,0x98,0x7E,0xA4,0x0F,0x91,0x70,0x61,
+        0xF5,0xD6,0xF0,0xA0,0xE4,0x64,0x4F,0x48,
+        0x8A,0x7A,0x5A,0x52,0xDE,0xEE,0x65,0x62,
+        0x07,0xC5,0x62,0xF9,0x88,0xE9,0x5C,0x69,
+        0x16,0xBD,0xC8,0x03,0x1B,0xC5,0xBE,0x1B,
+        0x7B,0x94,0x76,0x39,0xFE,0x05,0x0B,0x56,
+        0x93,0x9B,0xAA,0xA0,0xAD,0xFF,0x9A,0xE6,
+        0x74,0x5B,0x7B,0x18,0x1C,0x3B,0xE3,0xFD };
+
+unsigned char iso_test_9[WHIRLPOOL_DIGEST_LENGTH] = {
+        0x0C,0x99,0x00,0x5B,0xEB,0x57,0xEF,0xF5,
+        0x0A,0x7C,0xF0,0x05,0x56,0x0D,0xDF,0x5D,
+        0x29,0x05,0x7F,0xD8,0x6B,0x20,0xBF,0xD6,
+        0x2D,0xEC,0xA0,0xF1,0xCC,0xEA,0x4A,0xF5,
+        0x1F,0xC1,0x54,0x90,0xED,0xDC,0x47,0xAF,
+        0x32,0xBB,0x2B,0x66,0xC3,0x4F,0xF9,0xAD,
+        0x8C,0x60,0x08,0xAD,0x67,0x7F,0x77,0x12,
+        0x69,0x53,0xB2,0x26,0xE4,0xED,0x8B,0x01 };
+
+int main (int argc,char *argv[])
+{ unsigned char md[WHIRLPOOL_DIGEST_LENGTH];
+  int           i;
+  WHIRLPOOL_CTX ctx;
+
+#ifdef OPENSSL_IA32_SSE2
+    /* Alternative to this is to call OpenSSL_add_all_algorithms...
+     * The below code is retained exclusively for debugging purposes. */
+    { char      *env;
+
+        if ((env=getenv("OPENSSL_ia32cap")))
+            OPENSSL_ia32cap = strtoul (env,NULL,0);
+    }
+#endif
+
+    fprintf(stdout,"Testing Whirlpool ");
+
+    WHIRLPOOL("",0,md);
+    if (memcmp(md,iso_test_1,sizeof(iso_test_1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    WHIRLPOOL("a",1,md);
+    if (memcmp(md,iso_test_2,sizeof(iso_test_2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    WHIRLPOOL("abc",3,md);
+    if (memcmp(md,iso_test_3,sizeof(iso_test_3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    WHIRLPOOL("message digest",14,md);
+    if (memcmp(md,iso_test_4,sizeof(iso_test_4)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 4 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    WHIRLPOOL("abcdefghijklmnopqrstuvwxyz",26,md);
+    if (memcmp(md,iso_test_5,sizeof(iso_test_5)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 5 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    WHIRLPOOL(  "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                "abcdefghijklmnopqrstuvwxyz"
+                "0123456789",62,md);
+    if (memcmp(md,iso_test_6,sizeof(iso_test_6)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 6 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    WHIRLPOOL(  "1234567890""1234567890""1234567890""1234567890"
+                "1234567890""1234567890""1234567890""1234567890",80,md);
+    if (memcmp(md,iso_test_7,sizeof(iso_test_7)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 7 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    WHIRLPOOL("abcdbcdecdefdefgefghfghighijhijk",32,md);
+    if (memcmp(md,iso_test_8,sizeof(iso_test_8)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 8 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+ 
+    WHIRLPOOL_Init (&ctx);
+    for (i=0;i<1000000;i+=288)
+        WHIRLPOOL_Update (&ctx, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<288?1000000-i:288);
+    WHIRLPOOL_Final (md,&ctx);
+    if (memcmp(md,iso_test_9,sizeof(iso_test_9)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 9 of 9 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+  return 0;
+}
+#endif
diff --git a/src/lib/libcrypto/x509v3/v3_addr.c b/src/lib/libcrypto/x509v3/v3_addr.c
new file mode 100644
index 0000000000..9087d66e0a
--- /dev/null
+++ b/src/lib/libcrypto/x509v3/v3_addr.c
@@ -0,0 +1,1287 @@
+/*
+ * Contributed to the OpenSSL Project by the American Registry for
+ * Internet Numbers ("ARIN").
+ */
+/* ====================================================================
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ */
+
+/*
+ * Implementation of RFC 3779 section 2.2.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "cryptlib.h"
+#include <openssl/conf.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
+#include <openssl/buffer.h>
+#include <openssl/x509v3.h>
+
+#ifndef OPENSSL_NO_RFC3779
+
+/*
+ * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.
+ */
+
+ASN1_SEQUENCE(IPAddressRange) = {
+  ASN1_SIMPLE(IPAddressRange, min, ASN1_BIT_STRING),
+  ASN1_SIMPLE(IPAddressRange, max, ASN1_BIT_STRING)
+} ASN1_SEQUENCE_END(IPAddressRange)
+
+ASN1_CHOICE(IPAddressOrRange) = {
+  ASN1_SIMPLE(IPAddressOrRange, u.addressPrefix, ASN1_BIT_STRING),
+  ASN1_SIMPLE(IPAddressOrRange, u.addressRange,  IPAddressRange)
+} ASN1_CHOICE_END(IPAddressOrRange)
+
+ASN1_CHOICE(IPAddressChoice) = {
+  ASN1_SIMPLE(IPAddressChoice,      u.inherit,           ASN1_NULL),
+  ASN1_SEQUENCE_OF(IPAddressChoice, u.addressesOrRanges, IPAddressOrRange)
+} ASN1_CHOICE_END(IPAddressChoice)
+
+ASN1_SEQUENCE(IPAddressFamily) = {
+  ASN1_SIMPLE(IPAddressFamily, addressFamily,   ASN1_OCTET_STRING),
+  ASN1_SIMPLE(IPAddressFamily, ipAddressChoice, IPAddressChoice)
+} ASN1_SEQUENCE_END(IPAddressFamily)
+
+ASN1_ITEM_TEMPLATE(IPAddrBlocks) = 
+  ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+                        IPAddrBlocks, IPAddressFamily)
+ASN1_ITEM_TEMPLATE_END(IPAddrBlocks)
+
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressOrRange)
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressChoice)
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)
+
+/*
+ * How much buffer space do we need for a raw address?
+ */
+#define ADDR_RAW_BUF_LEN        16
+
+/*
+ * What's the address length associated with this AFI?
+ */
+static int length_from_afi(const unsigned afi)
+{
+  switch (afi) {
+  case IANA_AFI_IPV4:
+    return 4;
+  case IANA_AFI_IPV6:
+    return 16;
+  default:
+    return 0;
+  }
+}
+
+/*
+ * Extract the AFI from an IPAddressFamily.
+ */
+unsigned int v3_addr_get_afi(const IPAddressFamily *f)
+{
+  return ((f != NULL &&
+           f->addressFamily != NULL &&
+           f->addressFamily->data != NULL)
+          ? ((f->addressFamily->data[0] << 8) |
+             (f->addressFamily->data[1]))
+          : 0);
+}
+
+/*
+ * Expand the bitstring form of an address into a raw byte array.
+ * At the moment this is coded for simplicity, not speed.
+ */
+static void addr_expand(unsigned char *addr,
+                        const ASN1_BIT_STRING *bs,
+                        const int length,
+                        const unsigned char fill)
+{
+  OPENSSL_assert(bs->length >= 0 && bs->length <= length);
+  if (bs->length > 0) {
+    memcpy(addr, bs->data, bs->length);
+    if ((bs->flags & 7) != 0) {
+      unsigned char mask = 0xFF >> (8 - (bs->flags & 7));
+      if (fill == 0)
+        addr[bs->length - 1] &= ~mask;
+      else
+        addr[bs->length - 1] |= mask;
+    }
+  }
+  memset(addr + bs->length, fill, length - bs->length);
+}
+
+/*
+ * Extract the prefix length from a bitstring.
+ */
+#define addr_prefixlen(bs) ((int) ((bs)->length * 8 - ((bs)->flags & 7)))
+
+/*
+ * i2r handler for one address bitstring.
+ */
+static int i2r_address(BIO *out,
+                       const unsigned afi,
+                       const unsigned char fill,
+                       const ASN1_BIT_STRING *bs)
+{
+  unsigned char addr[ADDR_RAW_BUF_LEN];
+  int i, n;
+
+  switch (afi) {
+  case IANA_AFI_IPV4:
+    addr_expand(addr, bs, 4, fill);
+    BIO_printf(out, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
+    break;
+  case IANA_AFI_IPV6:
+    addr_expand(addr, bs, 16, fill);
+    for (n = 16; n > 1 && addr[n-1] == 0x00 && addr[n-2] == 0x00; n -= 2)
+      ;
+    for (i = 0; i < n; i += 2)
+      BIO_printf(out, "%x%s", (addr[i] << 8) | addr[i+1], (i < 14 ? ":" : ""));
+    if (i < 16)
+      BIO_puts(out, ":");
+    if (i == 0)
+      BIO_puts(out, ":");
+    break;
+  default:
+    for (i = 0; i < bs->length; i++)
+      BIO_printf(out, "%s%02x", (i > 0 ? ":" : ""), bs->data[i]);
+    BIO_printf(out, "[%d]", (int) (bs->flags & 7));
+    break;
+  }
+  return 1;
+}
+
+/*
+ * i2r handler for a sequence of addresses and ranges.
+ */
+static int i2r_IPAddressOrRanges(BIO *out,
+                                 const int indent,
+                                 const IPAddressOrRanges *aors,
+                                 const unsigned afi)
+{
+  int i;
+  for (i = 0; i < sk_IPAddressOrRange_num(aors); i++) {
+    const IPAddressOrRange *aor = sk_IPAddressOrRange_value(aors, i);
+    BIO_printf(out, "%*s", indent, "");
+    switch (aor->type) {
+    case IPAddressOrRange_addressPrefix:
+      if (!i2r_address(out, afi, 0x00, aor->u.addressPrefix))
+        return 0;
+      BIO_printf(out, "/%d\n", addr_prefixlen(aor->u.addressPrefix));
+      continue;
+    case IPAddressOrRange_addressRange:
+      if (!i2r_address(out, afi, 0x00, aor->u.addressRange->min))
+        return 0;
+      BIO_puts(out, "-");
+      if (!i2r_address(out, afi, 0xFF, aor->u.addressRange->max))
+        return 0;
+      BIO_puts(out, "\n");
+      continue;
+    }
+  }
+  return 1;
+}
+
+/*
+ * i2r handler for an IPAddrBlocks extension.
+ */
+static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
+                            void *ext,
+                            BIO *out,
+                            int indent)
+{
+  const IPAddrBlocks *addr = ext;
+  int i;
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    const unsigned int afi = v3_addr_get_afi(f);
+    switch (afi) {
+    case IANA_AFI_IPV4:
+      BIO_printf(out, "%*sIPv4", indent, "");
+      break;
+    case IANA_AFI_IPV6:
+      BIO_printf(out, "%*sIPv6", indent, "");
+      break;
+    default:
+      BIO_printf(out, "%*sUnknown AFI %u", indent, "", afi);
+      break;
+    }
+    if (f->addressFamily->length > 2) {
+      switch (f->addressFamily->data[2]) {
+      case   1:
+        BIO_puts(out, " (Unicast)");
+        break;
+      case   2:
+        BIO_puts(out, " (Multicast)");
+        break;
+      case   3:
+        BIO_puts(out, " (Unicast/Multicast)");
+        break;
+      case   4:
+        BIO_puts(out, " (MPLS)");
+        break;
+      case  64:
+        BIO_puts(out, " (Tunnel)");
+        break;
+      case  65:
+        BIO_puts(out, " (VPLS)");
+        break;
+      case  66:
+        BIO_puts(out, " (BGP MDT)");
+        break;
+      case 128:
+        BIO_puts(out, " (MPLS-labeled VPN)");
+        break;
+      default:  
+        BIO_printf(out, " (Unknown SAFI %u)",
+                   (unsigned) f->addressFamily->data[2]);
+        break;
+      }
+    }
+    switch (f->ipAddressChoice->type) {
+    case IPAddressChoice_inherit:
+      BIO_puts(out, ": inherit\n");
+      break;
+    case IPAddressChoice_addressesOrRanges:
+      BIO_puts(out, ":\n");
+      if (!i2r_IPAddressOrRanges(out,
+                                 indent + 2,
+                                 f->ipAddressChoice->u.addressesOrRanges,
+                                 afi))
+        return 0;
+      break;
+    }
+  }
+  return 1;
+}
+
+/*
+ * Sort comparison function for a sequence of IPAddressOrRange
+ * elements.
+ */
+static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
+                                const IPAddressOrRange *b,
+                                const int length)
+{
+  unsigned char addr_a[ADDR_RAW_BUF_LEN], addr_b[ADDR_RAW_BUF_LEN];
+  int prefixlen_a = 0, prefixlen_b = 0;
+  int r;
+
+  switch (a->type) {
+  case IPAddressOrRange_addressPrefix:
+    addr_expand(addr_a, a->u.addressPrefix, length, 0x00);
+    prefixlen_a = addr_prefixlen(a->u.addressPrefix);
+    break;
+  case IPAddressOrRange_addressRange:
+    addr_expand(addr_a, a->u.addressRange->min, length, 0x00);
+    prefixlen_a = length * 8;
+    break;
+  }
+
+  switch (b->type) {
+  case IPAddressOrRange_addressPrefix:
+    addr_expand(addr_b, b->u.addressPrefix, length, 0x00);
+    prefixlen_b = addr_prefixlen(b->u.addressPrefix);
+    break;
+  case IPAddressOrRange_addressRange:
+    addr_expand(addr_b, b->u.addressRange->min, length, 0x00);
+    prefixlen_b = length * 8;
+    break;
+  }
+
+  if ((r = memcmp(addr_a, addr_b, length)) != 0)
+    return r;
+  else
+    return prefixlen_a - prefixlen_b;
+}
+
+/*
+ * IPv4-specific closure over IPAddressOrRange_cmp, since sk_sort()
+ * comparision routines are only allowed two arguments.
+ */
+static int v4IPAddressOrRange_cmp(const IPAddressOrRange * const *a,
+                                  const IPAddressOrRange * const *b)
+{
+  return IPAddressOrRange_cmp(*a, *b, 4);
+}
+
+/*
+ * IPv6-specific closure over IPAddressOrRange_cmp, since sk_sort()
+ * comparision routines are only allowed two arguments.
+ */
+static int v6IPAddressOrRange_cmp(const IPAddressOrRange * const *a,
+                                  const IPAddressOrRange * const *b)
+{
+  return IPAddressOrRange_cmp(*a, *b, 16);
+}
+
+/*
+ * Calculate whether a range collapses to a prefix.
+ * See last paragraph of RFC 3779 2.2.3.7.
+ */
+static int range_should_be_prefix(const unsigned char *min,
+                                  const unsigned char *max,
+                                  const int length)
+{
+  unsigned char mask;
+  int i, j;
+
+  for (i = 0; i < length && min[i] == max[i]; i++)
+    ;
+  for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--)
+    ;
+  if (i < j)
+    return -1;
+  if (i > j)
+    return i * 8;
+  mask = min[i] ^ max[i];
+  switch (mask) {
+  case 0x01: j = 7; break;
+  case 0x03: j = 6; break;
+  case 0x07: j = 5; break;
+  case 0x0F: j = 4; break;
+  case 0x1F: j = 3; break;
+  case 0x3F: j = 2; break;
+  case 0x7F: j = 1; break;
+  default:   return -1;
+  }
+  if ((min[i] & mask) != 0 || (max[i] & mask) != mask)
+    return -1;
+  else
+    return i * 8 + j;
+}
+
+/*
+ * Construct a prefix.
+ */
+static int make_addressPrefix(IPAddressOrRange **result,
+                              unsigned char *addr,
+                              const int prefixlen)
+{
+  int bytelen = (prefixlen + 7) / 8, bitlen = prefixlen % 8;
+  IPAddressOrRange *aor = IPAddressOrRange_new();
+
+  if (aor == NULL)
+    return 0;
+  aor->type = IPAddressOrRange_addressPrefix;
+  if (aor->u.addressPrefix == NULL &&
+      (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)
+    goto err;
+  if (!ASN1_BIT_STRING_set(aor->u.addressPrefix, addr, bytelen))
+    goto err;
+  aor->u.addressPrefix->flags &= ~7;
+  aor->u.addressPrefix->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+  if (bitlen > 0) {
+    aor->u.addressPrefix->data[bytelen - 1] &= ~(0xFF >> bitlen);
+    aor->u.addressPrefix->flags |= 8 - bitlen;
+  }
+  
+  *result = aor;
+  return 1;
+
+ err:
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Construct a range.  If it can be expressed as a prefix,
+ * return a prefix instead.  Doing this here simplifies
+ * the rest of the code considerably.
+ */
+static int make_addressRange(IPAddressOrRange **result,
+                             unsigned char *min,
+                             unsigned char *max,
+                             const int length)
+{
+  IPAddressOrRange *aor;
+  int i, prefixlen;
+
+  if ((prefixlen = range_should_be_prefix(min, max, length)) >= 0)
+    return make_addressPrefix(result, min, prefixlen);
+
+  if ((aor = IPAddressOrRange_new()) == NULL)
+    return 0;
+  aor->type = IPAddressOrRange_addressRange;
+  OPENSSL_assert(aor->u.addressRange == NULL);
+  if ((aor->u.addressRange = IPAddressRange_new()) == NULL)
+    goto err;
+  if (aor->u.addressRange->min == NULL &&
+      (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)
+    goto err;
+  if (aor->u.addressRange->max == NULL &&
+      (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)
+    goto err;
+
+  for (i = length; i > 0 && min[i - 1] == 0x00; --i)
+    ;
+  if (!ASN1_BIT_STRING_set(aor->u.addressRange->min, min, i))
+    goto err;
+  aor->u.addressRange->min->flags &= ~7;
+  aor->u.addressRange->min->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+  if (i > 0) {
+    unsigned char b = min[i - 1];
+    int j = 1;
+    while ((b & (0xFFU >> j)) != 0) 
+      ++j;
+    aor->u.addressRange->min->flags |= 8 - j;
+  }
+
+  for (i = length; i > 0 && max[i - 1] == 0xFF; --i)
+    ;
+  if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i))
+    goto err;
+  aor->u.addressRange->max->flags &= ~7;
+  aor->u.addressRange->max->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+  if (i > 0) {
+    unsigned char b = max[i - 1];
+    int j = 1;
+    while ((b & (0xFFU >> j)) != (0xFFU >> j))
+      ++j;
+    aor->u.addressRange->max->flags |= 8 - j;
+  }
+
+  *result = aor;
+  return 1;
+
+ err:
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Construct a new address family or find an existing one.
+ */
+static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
+                                             const unsigned afi,
+                                             const unsigned *safi)
+{
+  IPAddressFamily *f;
+  unsigned char key[3];
+  unsigned keylen;
+  int i;
+
+  key[0] = (afi >> 8) & 0xFF;
+  key[1] = afi & 0xFF;
+  if (safi != NULL) {
+    key[2] = *safi & 0xFF;
+    keylen = 3;
+  } else {
+    keylen = 2;
+  }
+
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    f = sk_IPAddressFamily_value(addr, i);
+    OPENSSL_assert(f->addressFamily->data != NULL);
+    if (f->addressFamily->length == keylen &&
+        !memcmp(f->addressFamily->data, key, keylen))
+      return f;
+  }
+
+  if ((f = IPAddressFamily_new()) == NULL)
+    goto err;
+  if (f->ipAddressChoice == NULL &&
+      (f->ipAddressChoice = IPAddressChoice_new()) == NULL)
+    goto err;
+  if (f->addressFamily == NULL && 
+      (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
+    goto err;
+  if (!ASN1_OCTET_STRING_set(f->addressFamily, key, keylen))
+    goto err;
+  if (!sk_IPAddressFamily_push(addr, f))
+    goto err;
+
+  return f;
+
+ err:
+  IPAddressFamily_free(f);
+  return NULL;
+}
+
+/*
+ * Add an inheritance element.
+ */
+int v3_addr_add_inherit(IPAddrBlocks *addr,
+                        const unsigned afi,
+                        const unsigned *safi)
+{
+  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
+  if (f == NULL ||
+      f->ipAddressChoice == NULL ||
+      (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
+       f->ipAddressChoice->u.addressesOrRanges != NULL))
+    return 0;
+  if (f->ipAddressChoice->type == IPAddressChoice_inherit &&
+      f->ipAddressChoice->u.inherit != NULL)
+    return 1;
+  if (f->ipAddressChoice->u.inherit == NULL &&
+      (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)
+    return 0;
+  f->ipAddressChoice->type = IPAddressChoice_inherit;
+  return 1;
+}
+
+/*
+ * Construct an IPAddressOrRange sequence, or return an existing one.
+ */
+static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
+                                               const unsigned afi,
+                                               const unsigned *safi)
+{
+  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
+  IPAddressOrRanges *aors = NULL;
+
+  if (f == NULL ||
+      f->ipAddressChoice == NULL ||
+      (f->ipAddressChoice->type == IPAddressChoice_inherit &&
+       f->ipAddressChoice->u.inherit != NULL))
+    return NULL;
+  if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges)
+    aors = f->ipAddressChoice->u.addressesOrRanges;
+  if (aors != NULL)
+    return aors;
+  if ((aors = sk_IPAddressOrRange_new_null()) == NULL)
+    return NULL;
+  switch (afi) {
+  case IANA_AFI_IPV4:
+    sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp);
+    break;
+  case IANA_AFI_IPV6:
+    sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp);
+    break;
+  }
+  f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges;
+  f->ipAddressChoice->u.addressesOrRanges = aors;
+  return aors;
+}
+
+/*
+ * Add a prefix.
+ */
+int v3_addr_add_prefix(IPAddrBlocks *addr,
+                       const unsigned afi,
+                       const unsigned *safi,
+                       unsigned char *a,
+                       const int prefixlen)
+{
+  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
+  IPAddressOrRange *aor;
+  if (aors == NULL || !make_addressPrefix(&aor, a, prefixlen))
+    return 0;
+  if (sk_IPAddressOrRange_push(aors, aor))
+    return 1;
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Add a range.
+ */
+int v3_addr_add_range(IPAddrBlocks *addr,
+                      const unsigned afi,
+                      const unsigned *safi,
+                      unsigned char *min,
+                      unsigned char *max)
+{
+  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
+  IPAddressOrRange *aor;
+  int length = length_from_afi(afi);
+  if (aors == NULL)
+    return 0;
+  if (!make_addressRange(&aor, min, max, length))
+    return 0;
+  if (sk_IPAddressOrRange_push(aors, aor))
+    return 1;
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Extract min and max values from an IPAddressOrRange.
+ */
+static void extract_min_max(IPAddressOrRange *aor,
+                            unsigned char *min,
+                            unsigned char *max,
+                            int length)
+{
+  OPENSSL_assert(aor != NULL && min != NULL && max != NULL);
+  switch (aor->type) {
+  case IPAddressOrRange_addressPrefix:
+    addr_expand(min, aor->u.addressPrefix, length, 0x00);
+    addr_expand(max, aor->u.addressPrefix, length, 0xFF);
+    return;
+  case IPAddressOrRange_addressRange:
+    addr_expand(min, aor->u.addressRange->min, length, 0x00);
+    addr_expand(max, aor->u.addressRange->max, length, 0xFF);
+    return;
+  }
+}
+
+/*
+ * Public wrapper for extract_min_max().
+ */
+int v3_addr_get_range(IPAddressOrRange *aor,
+                      const unsigned afi,
+                      unsigned char *min,
+                      unsigned char *max,
+                      const int length)
+{
+  int afi_length = length_from_afi(afi);
+  if (aor == NULL || min == NULL || max == NULL ||
+      afi_length == 0 || length < afi_length ||
+      (aor->type != IPAddressOrRange_addressPrefix &&
+       aor->type != IPAddressOrRange_addressRange))
+    return 0;
+  extract_min_max(aor, min, max, afi_length);
+  return afi_length;
+}
+
+/*
+ * Sort comparision function for a sequence of IPAddressFamily.
+ *
+ * The last paragraph of RFC 3779 2.2.3.3 is slightly ambiguous about
+ * the ordering: I can read it as meaning that IPv6 without a SAFI
+ * comes before IPv4 with a SAFI, which seems pretty weird.  The
+ * examples in appendix B suggest that the author intended the
+ * null-SAFI rule to apply only within a single AFI, which is what I
+ * would have expected and is what the following code implements.
+ */
+static int IPAddressFamily_cmp(const IPAddressFamily * const *a_,
+                               const IPAddressFamily * const *b_)
+{
+  const ASN1_OCTET_STRING *a = (*a_)->addressFamily;
+  const ASN1_OCTET_STRING *b = (*b_)->addressFamily;
+  int len = ((a->length <= b->length) ? a->length : b->length);
+  int cmp = memcmp(a->data, b->data, len);
+  return cmp ? cmp : a->length - b->length;
+}
+
+/*
+ * Check whether an IPAddrBLocks is in canonical form.
+ */
+int v3_addr_is_canonical(IPAddrBlocks *addr)
+{
+  unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
+  unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
+  IPAddressOrRanges *aors;
+  int i, j, k;
+
+  /*
+   * Empty extension is cannonical.
+   */
+  if (addr == NULL)
+    return 1;
+
+  /*
+   * Check whether the top-level list is in order.
+   */
+  for (i = 0; i < sk_IPAddressFamily_num(addr) - 1; i++) {
+    const IPAddressFamily *a = sk_IPAddressFamily_value(addr, i);
+    const IPAddressFamily *b = sk_IPAddressFamily_value(addr, i + 1);
+    if (IPAddressFamily_cmp(&a, &b) >= 0)
+      return 0;
+  }
+
+  /*
+   * Top level's ok, now check each address family.
+   */
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    int length = length_from_afi(v3_addr_get_afi(f));
+
+    /*
+     * Inheritance is canonical.  Anything other than inheritance or
+     * a SEQUENCE OF IPAddressOrRange is an ASN.1 error or something.
+     */
+    if (f == NULL || f->ipAddressChoice == NULL)
+      return 0;
+    switch (f->ipAddressChoice->type) {
+    case IPAddressChoice_inherit:
+      continue;
+    case IPAddressChoice_addressesOrRanges:
+      break;
+    default:
+      return 0;
+    }
+
+    /*
+     * It's an IPAddressOrRanges sequence, check it.
+     */
+    aors = f->ipAddressChoice->u.addressesOrRanges;
+    if (sk_IPAddressOrRange_num(aors) == 0)
+      return 0;
+    for (j = 0; j < sk_IPAddressOrRange_num(aors) - 1; j++) {
+      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
+      IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, j + 1);
+
+      extract_min_max(a, a_min, a_max, length);
+      extract_min_max(b, b_min, b_max, length);
+
+      /*
+       * Punt misordered list, overlapping start, or inverted range.
+       */
+      if (memcmp(a_min, b_min, length) >= 0 ||
+          memcmp(a_min, a_max, length) > 0 ||
+          memcmp(b_min, b_max, length) > 0)
+        return 0;
+
+      /*
+       * Punt if adjacent or overlapping.  Check for adjacency by
+       * subtracting one from b_min first.
+       */
+      for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--)
+        ;
+      if (memcmp(a_max, b_min, length) >= 0)
+        return 0;
+
+      /*
+       * Check for range that should be expressed as a prefix.
+       */
+      if (a->type == IPAddressOrRange_addressRange &&
+          range_should_be_prefix(a_min, a_max, length) >= 0)
+        return 0;
+    }
+
+    /*
+     * Check final range to see if it should be a prefix.
+     */
+    j = sk_IPAddressOrRange_num(aors) - 1;
+    {
+      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
+      if (a->type == IPAddressOrRange_addressRange) {
+        extract_min_max(a, a_min, a_max, length);
+        if (range_should_be_prefix(a_min, a_max, length) >= 0)
+          return 0;
+      }
+    }
+  }
+
+  /*
+   * If we made it through all that, we're happy.
+   */
+  return 1;
+}
+
+/*
+ * Whack an IPAddressOrRanges into canonical form.
+ */
+static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
+                                      const unsigned afi)
+{
+  int i, j, length = length_from_afi(afi);
+
+  /*
+   * Sort the IPAddressOrRanges sequence.
+   */
+  sk_IPAddressOrRange_sort(aors);
+
+  /*
+   * Clean up representation issues, punt on duplicates or overlaps.
+   */
+  for (i = 0; i < sk_IPAddressOrRange_num(aors) - 1; i++) {
+    IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, i);
+    IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, i + 1);
+    unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
+    unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
+
+    extract_min_max(a, a_min, a_max, length);
+    extract_min_max(b, b_min, b_max, length);
+
+    /*
+     * Punt overlaps.
+     */
+    if (memcmp(a_max, b_min, length) >= 0)
+      return 0;
+
+    /*
+     * Merge if a and b are adjacent.  We check for
+     * adjacency by subtracting one from b_min first.
+     */
+    for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--)
+      ;
+    if (memcmp(a_max, b_min, length) == 0) {
+      IPAddressOrRange *merged;
+      if (!make_addressRange(&merged, a_min, b_max, length))
+        return 0;
+      sk_IPAddressOrRange_set(aors, i, merged);
+      sk_IPAddressOrRange_delete(aors, i + 1);
+      IPAddressOrRange_free(a);
+      IPAddressOrRange_free(b);
+      --i;
+      continue;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * Whack an IPAddrBlocks extension into canonical form.
+ */
+int v3_addr_canonize(IPAddrBlocks *addr)
+{
+  int i;
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
+        !IPAddressOrRanges_canonize(f->ipAddressChoice->u.addressesOrRanges,
+                                    v3_addr_get_afi(f)))
+      return 0;
+  }
+  sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
+  sk_IPAddressFamily_sort(addr);
+  OPENSSL_assert(v3_addr_is_canonical(addr));
+  return 1;
+}
+
+/*
+ * v2i handler for the IPAddrBlocks extension.
+ */
+static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
+                              struct v3_ext_ctx *ctx,
+                              STACK_OF(CONF_VALUE) *values)
+{
+  static const char v4addr_chars[] = "0123456789.";
+  static const char v6addr_chars[] = "0123456789.:abcdefABCDEF";
+  IPAddrBlocks *addr = NULL;
+  char *s = NULL, *t;
+  int i;
+  
+  if ((addr = sk_IPAddressFamily_new(IPAddressFamily_cmp)) == NULL) {
+    X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+    return NULL;
+  }
+
+  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
+    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);
+    unsigned char min[ADDR_RAW_BUF_LEN], max[ADDR_RAW_BUF_LEN];
+    unsigned afi, *safi = NULL, safi_;
+    const char *addr_chars;
+    int prefixlen, i1, i2, delim, length;
+
+    if (       !name_cmp(val->name, "IPv4")) {
+      afi = IANA_AFI_IPV4;
+    } else if (!name_cmp(val->name, "IPv6")) {
+      afi = IANA_AFI_IPV6;
+    } else if (!name_cmp(val->name, "IPv4-SAFI")) {
+      afi = IANA_AFI_IPV4;
+      safi = &safi_;
+    } else if (!name_cmp(val->name, "IPv6-SAFI")) {
+      afi = IANA_AFI_IPV6;
+      safi = &safi_;
+    } else {
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_NAME_ERROR);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    switch (afi) {
+    case IANA_AFI_IPV4:
+      addr_chars = v4addr_chars;
+      break;
+    case IANA_AFI_IPV6:
+      addr_chars = v6addr_chars;
+      break;
+    }
+
+    length = length_from_afi(afi);
+
+    /*
+     * Handle SAFI, if any, and BUF_strdup() so we can null-terminate
+     * the other input values.
+     */
+    if (safi != NULL) {
+      *safi = strtoul(val->value, &t, 0);
+      t += strspn(t, " \t");
+      if (*safi > 0xFF || *t++ != ':') {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_SAFI);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      t += strspn(t, " \t");
+      s = BUF_strdup(t);
+    } else {
+      s = BUF_strdup(val->value);
+    }
+    if (s == NULL) {
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+      goto err;
+    }
+
+    /*
+     * Check for inheritance.  Not worth additional complexity to
+     * optimize this (seldom-used) case.
+     */
+    if (!strcmp(s, "inherit")) {
+      if (!v3_addr_add_inherit(addr, afi, safi)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_INHERITANCE);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      OPENSSL_free(s);
+      s = NULL;
+      continue;
+    }
+
+    i1 = strspn(s, addr_chars);
+    i2 = i1 + strspn(s + i1, " \t");
+    delim = s[i2++];
+    s[i1] = '\0';
+
+    if (a2i_ipadd(min, s) != length) {
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    switch (delim) {
+    case '/':
+      prefixlen = (int) strtoul(s + i2, &t, 10);
+      if (t == s + i2 || *t != '\0') {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      if (!v3_addr_add_prefix(addr, afi, safi, min, prefixlen)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      break;
+    case '-':
+      i1 = i2 + strspn(s + i2, " \t");
+      i2 = i1 + strspn(s + i1, addr_chars);
+      if (i1 == i2 || s[i2] != '\0') {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      if (a2i_ipadd(max, s + i1) != length) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      if (!v3_addr_add_range(addr, afi, safi, min, max)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      break;
+    case '\0':
+      if (!v3_addr_add_prefix(addr, afi, safi, min, length * 8)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      break;
+    default:
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    OPENSSL_free(s);
+    s = NULL;
+  }
+
+  /*
+   * Canonize the result, then we're done.
+   */
+  if (!v3_addr_canonize(addr))
+    goto err;    
+  return addr;
+
+ err:
+  OPENSSL_free(s);
+  sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
+  return NULL;
+}
+
+/*
+ * OpenSSL dispatch
+ */
+const X509V3_EXT_METHOD v3_addr = {
+  NID_sbgp_ipAddrBlock,         /* nid */
+  0,                            /* flags */
+  ASN1_ITEM_ref(IPAddrBlocks),  /* template */
+  0, 0, 0, 0,                   /* old functions, ignored */
+  0,                            /* i2s */
+  0,                            /* s2i */
+  0,                            /* i2v */
+  v2i_IPAddrBlocks,             /* v2i */
+  i2r_IPAddrBlocks,             /* i2r */
+  0,                            /* r2i */
+  NULL                          /* extension-specific data */
+};
+
+/*
+ * Figure out whether extension sues inheritance.
+ */
+int v3_addr_inherits(IPAddrBlocks *addr)
+{
+  int i;
+  if (addr == NULL)
+    return 0;
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    if (f->ipAddressChoice->type == IPAddressChoice_inherit)
+      return 1;
+  }
+  return 0;
+}
+
+/*
+ * Figure out whether parent contains child.
+ */
+static int addr_contains(IPAddressOrRanges *parent,
+                         IPAddressOrRanges *child,
+                         int length)
+{
+  unsigned char p_min[ADDR_RAW_BUF_LEN], p_max[ADDR_RAW_BUF_LEN];
+  unsigned char c_min[ADDR_RAW_BUF_LEN], c_max[ADDR_RAW_BUF_LEN];
+  int p, c;
+
+  if (child == NULL || parent == child)
+    return 1;
+  if (parent == NULL)
+    return 0;
+
+  p = 0;
+  for (c = 0; c < sk_IPAddressOrRange_num(child); c++) {
+    extract_min_max(sk_IPAddressOrRange_value(child, c),
+                    c_min, c_max, length);
+    for (;; p++) {
+      if (p >= sk_IPAddressOrRange_num(parent))
+        return 0;
+      extract_min_max(sk_IPAddressOrRange_value(parent, p),
+                      p_min, p_max, length);
+      if (memcmp(p_max, c_max, length) < 0)
+        continue;
+      if (memcmp(p_min, c_min, length) > 0)
+        return 0;
+      break;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * Test whether a is a subset of b.
+ */
+int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
+{
+  int i;
+  if (a == NULL || a == b)
+    return 1;
+  if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b))
+    return 0;
+  sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp);
+  for (i = 0; i < sk_IPAddressFamily_num(a); i++) {
+    IPAddressFamily *fa = sk_IPAddressFamily_value(a, i);
+    int j = sk_IPAddressFamily_find(b, fa);
+    IPAddressFamily *fb;
+    fb = sk_IPAddressFamily_value(b, j);
+    if (fb == NULL)
+       return 0;
+    if (!addr_contains(fb->ipAddressChoice->u.addressesOrRanges, 
+                       fa->ipAddressChoice->u.addressesOrRanges,
+                       length_from_afi(v3_addr_get_afi(fb))))
+      return 0;
+  }
+  return 1;
+}
+
+/*
+ * Validation error handling via callback.
+ */
+#define validation_err(_err_)           \
+  do {                                  \
+    if (ctx != NULL) {                  \
+      ctx->error = _err_;               \
+      ctx->error_depth = i;             \
+      ctx->current_cert = x;            \
+      ret = ctx->verify_cb(0, ctx);     \
+    } else {                            \
+      ret = 0;                          \
+    }                                   \
+    if (!ret)                           \
+      goto done;                        \
+  } while (0)
+
+/*
+ * Core code for RFC 3779 2.3 path validation.
+ */
+static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
+                                          STACK_OF(X509) *chain,
+                                          IPAddrBlocks *ext)
+{
+  IPAddrBlocks *child = NULL;
+  int i, j, ret = 1;
+  X509 *x;
+
+  OPENSSL_assert(chain != NULL && sk_X509_num(chain) > 0);
+  OPENSSL_assert(ctx != NULL || ext != NULL);
+  OPENSSL_assert(ctx == NULL || ctx->verify_cb != NULL);
+
+  /*
+   * Figure out where to start.  If we don't have an extension to
+   * check, we're done.  Otherwise, check canonical form and
+   * set up for walking up the chain.
+   */
+  if (ext != NULL) {
+    i = -1;
+    x = NULL;
+  } else {
+    i = 0;
+    x = sk_X509_value(chain, i);
+    OPENSSL_assert(x != NULL);
+    if ((ext = x->rfc3779_addr) == NULL)
+      goto done;
+  }
+  if (!v3_addr_is_canonical(ext))
+    validation_err(X509_V_ERR_INVALID_EXTENSION);
+  sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp);
+  if ((child = sk_IPAddressFamily_dup(ext)) == NULL) {
+    X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE);
+    ret = 0;
+    goto done;
+  }
+
+  /*
+   * Now walk up the chain.  No cert may list resources that its
+   * parent doesn't list.
+   */
+  for (i++; i < sk_X509_num(chain); i++) {
+    x = sk_X509_value(chain, i);
+    OPENSSL_assert(x != NULL);
+    if (!v3_addr_is_canonical(x->rfc3779_addr))
+      validation_err(X509_V_ERR_INVALID_EXTENSION);
+    if (x->rfc3779_addr == NULL) {
+      for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
+        IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
+        if (fc->ipAddressChoice->type != IPAddressChoice_inherit) {
+          validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+          break;
+        }
+      }
+      continue;
+    }
+    sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp);
+    for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
+      IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
+      int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);
+      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, k);
+      if (fp == NULL) {
+        if (fc->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
+          validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+          break;
+        }
+        continue;
+      }
+      if (fp->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
+        if (fc->ipAddressChoice->type == IPAddressChoice_inherit ||
+            addr_contains(fp->ipAddressChoice->u.addressesOrRanges, 
+                          fc->ipAddressChoice->u.addressesOrRanges,
+                          length_from_afi(v3_addr_get_afi(fc))))
+          sk_IPAddressFamily_set(child, j, fp);
+        else
+          validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      }
+    }
+  }
+
+  /*
+   * Trust anchor can't inherit.
+   */
+  OPENSSL_assert(x != NULL);
+  if (x->rfc3779_addr != NULL) {
+    for (j = 0; j < sk_IPAddressFamily_num(x->rfc3779_addr); j++) {
+      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, j);
+      if (fp->ipAddressChoice->type == IPAddressChoice_inherit &&
+          sk_IPAddressFamily_find(child, fp) >= 0)
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+    }
+  }
+
+ done:
+  sk_IPAddressFamily_free(child);
+  return ret;
+}
+
+#undef validation_err
+
+/*
+ * RFC 3779 2.3 path validation -- called from X509_verify_cert().
+ */
+int v3_addr_validate_path(X509_STORE_CTX *ctx)
+{
+  return v3_addr_validate_path_internal(ctx, ctx->chain, NULL);
+}
+
+/*
+ * RFC 3779 2.3 path validation of an extension.
+ * Test whether chain covers extension.
+ */
+int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
+                                  IPAddrBlocks *ext,
+                                  int allow_inheritance)
+{
+  if (ext == NULL)
+    return 1;
+  if (chain == NULL || sk_X509_num(chain) == 0)
+    return 0;
+  if (!allow_inheritance && v3_addr_inherits(ext))
+    return 0;
+  return v3_addr_validate_path_internal(NULL, chain, ext);
+}
+
+#endif /* OPENSSL_NO_RFC3779 */
diff --git a/src/lib/libcrypto/x509v3/v3_asid.c b/src/lib/libcrypto/x509v3/v3_asid.c
new file mode 100644
index 0000000000..56702f86b9
--- /dev/null
+++ b/src/lib/libcrypto/x509v3/v3_asid.c
@@ -0,0 +1,844 @@
+/*
+ * Contributed to the OpenSSL Project by the American Registry for
+ * Internet Numbers ("ARIN").
+ */
+/* ====================================================================
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ */
+
+/*
+ * Implementation of RFC 3779 section 3.2.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "cryptlib.h"
+#include <openssl/conf.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
+#include <openssl/x509v3.h>
+#include <openssl/x509.h>
+#include <openssl/bn.h>
+
+#ifndef OPENSSL_NO_RFC3779
+
+/*
+ * OpenSSL ASN.1 template translation of RFC 3779 3.2.3.
+ */
+
+ASN1_SEQUENCE(ASRange) = {
+  ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
+  ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
+} ASN1_SEQUENCE_END(ASRange)
+
+ASN1_CHOICE(ASIdOrRange) = {
+  ASN1_SIMPLE(ASIdOrRange, u.id,    ASN1_INTEGER),
+  ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
+} ASN1_CHOICE_END(ASIdOrRange)
+
+ASN1_CHOICE(ASIdentifierChoice) = {
+  ASN1_SIMPLE(ASIdentifierChoice,      u.inherit,       ASN1_NULL),
+  ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)
+} ASN1_CHOICE_END(ASIdentifierChoice)
+
+ASN1_SEQUENCE(ASIdentifiers) = {
+  ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),
+  ASN1_EXP_OPT(ASIdentifiers, rdi,   ASIdentifierChoice, 1)
+} ASN1_SEQUENCE_END(ASIdentifiers)
+
+IMPLEMENT_ASN1_FUNCTIONS(ASRange)
+IMPLEMENT_ASN1_FUNCTIONS(ASIdOrRange)
+IMPLEMENT_ASN1_FUNCTIONS(ASIdentifierChoice)
+IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers)
+
+/*
+ * i2r method for an ASIdentifierChoice.
+ */
+static int i2r_ASIdentifierChoice(BIO *out,
+                                  ASIdentifierChoice *choice,
+                                  int indent,
+                                  const char *msg)
+{
+  int i;
+  char *s;
+  if (choice == NULL)
+    return 1;
+  BIO_printf(out, "%*s%s:\n", indent, "", msg);
+  switch (choice->type) {
+  case ASIdentifierChoice_inherit:
+    BIO_printf(out, "%*sinherit\n", indent + 2, "");
+    break;
+  case ASIdentifierChoice_asIdsOrRanges:
+    for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges); i++) {
+      ASIdOrRange *aor = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+      switch (aor->type) {
+      case ASIdOrRange_id:
+        if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)
+          return 0;
+        BIO_printf(out, "%*s%s\n", indent + 2, "", s);
+        OPENSSL_free(s);
+        break;
+      case ASIdOrRange_range:
+        if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL)
+          return 0;
+        BIO_printf(out, "%*s%s-", indent + 2, "", s);
+        OPENSSL_free(s);
+        if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL)
+          return 0;
+        BIO_printf(out, "%s\n", s);
+        OPENSSL_free(s);
+        break;
+      default:
+        return 0;
+      }
+    }
+    break;
+  default:
+    return 0;
+  }
+  return 1;
+}
+
+/*
+ * i2r method for an ASIdentifier extension.
+ */
+static int i2r_ASIdentifiers(const X509V3_EXT_METHOD *method,
+                             void *ext,
+                             BIO *out,
+                             int indent)
+{
+  ASIdentifiers *asid = ext;
+  return (i2r_ASIdentifierChoice(out, asid->asnum, indent,
+                                 "Autonomous System Numbers") &&
+          i2r_ASIdentifierChoice(out, asid->rdi, indent,
+                                 "Routing Domain Identifiers"));
+}
+
+/*
+ * Sort comparision function for a sequence of ASIdOrRange elements.
+ */
+static int ASIdOrRange_cmp(const ASIdOrRange * const *a_,
+                           const ASIdOrRange * const *b_)
+{
+  const ASIdOrRange *a = *a_, *b = *b_;
+
+  assert((a->type == ASIdOrRange_id && a->u.id != NULL) ||
+         (a->type == ASIdOrRange_range && a->u.range != NULL &&
+          a->u.range->min != NULL && a->u.range->max != NULL));
+
+  assert((b->type == ASIdOrRange_id && b->u.id != NULL) ||
+         (b->type == ASIdOrRange_range && b->u.range != NULL &&
+          b->u.range->min != NULL && b->u.range->max != NULL));
+
+  if (a->type == ASIdOrRange_id && b->type == ASIdOrRange_id)
+    return ASN1_INTEGER_cmp(a->u.id, b->u.id);
+
+  if (a->type == ASIdOrRange_range && b->type == ASIdOrRange_range) {
+    int r = ASN1_INTEGER_cmp(a->u.range->min, b->u.range->min);
+    return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max, b->u.range->max);
+  }
+
+  if (a->type == ASIdOrRange_id)
+    return ASN1_INTEGER_cmp(a->u.id, b->u.range->min);
+  else
+    return ASN1_INTEGER_cmp(a->u.range->min, b->u.id);
+}
+
+/*
+ * Add an inherit element.
+ */
+int v3_asid_add_inherit(ASIdentifiers *asid, int which)
+{
+  ASIdentifierChoice **choice;
+  if (asid == NULL)
+    return 0;
+  switch (which) {
+  case V3_ASID_ASNUM:
+    choice = &asid->asnum;
+    break;
+  case V3_ASID_RDI:
+    choice = &asid->rdi;
+    break;
+  default:
+    return 0;
+  }
+  if (*choice == NULL) {
+    if ((*choice = ASIdentifierChoice_new()) == NULL)
+      return 0;
+    assert((*choice)->u.inherit == NULL);
+    if (((*choice)->u.inherit = ASN1_NULL_new()) == NULL)
+      return 0;
+    (*choice)->type = ASIdentifierChoice_inherit;
+  }
+  return (*choice)->type == ASIdentifierChoice_inherit;
+}
+
+/*
+ * Add an ID or range to an ASIdentifierChoice.
+ */
+int v3_asid_add_id_or_range(ASIdentifiers *asid,
+                            int which,
+                            ASN1_INTEGER *min,
+                            ASN1_INTEGER *max)
+{
+  ASIdentifierChoice **choice;
+  ASIdOrRange *aor;
+  if (asid == NULL)
+    return 0;
+  switch (which) {
+  case V3_ASID_ASNUM:
+    choice = &asid->asnum;
+    break;
+  case V3_ASID_RDI:
+    choice = &asid->rdi;
+    break;
+  default:
+    return 0;
+  }
+  if (*choice != NULL && (*choice)->type == ASIdentifierChoice_inherit)
+    return 0;
+  if (*choice == NULL) {
+    if ((*choice = ASIdentifierChoice_new()) == NULL)
+      return 0;
+    assert((*choice)->u.asIdsOrRanges == NULL);
+    (*choice)->u.asIdsOrRanges = sk_ASIdOrRange_new(ASIdOrRange_cmp);
+    if ((*choice)->u.asIdsOrRanges == NULL)
+      return 0;
+    (*choice)->type = ASIdentifierChoice_asIdsOrRanges;
+  }
+  if ((aor = ASIdOrRange_new()) == NULL)
+    return 0;
+  if (max == NULL) {
+    aor->type = ASIdOrRange_id;
+    aor->u.id = min;
+  } else {
+    aor->type = ASIdOrRange_range;
+    if ((aor->u.range = ASRange_new()) == NULL)
+      goto err;
+    ASN1_INTEGER_free(aor->u.range->min);
+    aor->u.range->min = min;
+    ASN1_INTEGER_free(aor->u.range->max);
+    aor->u.range->max = max;
+  }
+  if (!(sk_ASIdOrRange_push((*choice)->u.asIdsOrRanges, aor)))
+    goto err;
+  return 1;
+
+ err:
+  ASIdOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Extract min and max values from an ASIdOrRange.
+ */
+static void extract_min_max(ASIdOrRange *aor,
+                            ASN1_INTEGER **min,
+                            ASN1_INTEGER **max)
+{
+  assert(aor != NULL && min != NULL && max != NULL);
+  switch (aor->type) {
+  case ASIdOrRange_id:
+    *min = aor->u.id;
+    *max = aor->u.id;
+    return;
+  case ASIdOrRange_range:
+    *min = aor->u.range->min;
+    *max = aor->u.range->max;
+    return;
+  }
+}
+
+/*
+ * Check whether an ASIdentifierChoice is in canonical form.
+ */
+static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
+{
+  ASN1_INTEGER *a_max_plus_one = NULL;
+  BIGNUM *bn = NULL;
+  int i, ret = 0;
+
+  /*
+   * Empty element or inheritance is canonical.
+   */
+  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)
+    return 1;
+
+  /*
+   * If not a list, or if empty list, it's broken.
+   */
+  if (choice->type != ASIdentifierChoice_asIdsOrRanges ||
+      sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)
+    return 0;
+
+  /*
+   * It's a list, check it.
+   */
+  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
+    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
+    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;
+
+    extract_min_max(a, &a_min, &a_max);
+    extract_min_max(b, &b_min, &b_max);
+
+    /*
+     * Punt misordered list, overlapping start, or inverted range.
+     */
+    if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 ||
+        ASN1_INTEGER_cmp(a_min, a_max) > 0 ||
+        ASN1_INTEGER_cmp(b_min, b_max) > 0)
+      goto done;
+
+    /*
+     * Calculate a_max + 1 to check for adjacency.
+     */
+    if ((bn == NULL && (bn = BN_new()) == NULL) ||
+        ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
+        !BN_add_word(bn, 1) ||
+        (a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,
+                ERR_R_MALLOC_FAILURE);
+      goto done;
+    }
+    
+    /*
+     * Punt if adjacent or overlapping.
+     */
+    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) >= 0)
+      goto done;
+  }
+
+  ret = 1;
+
+ done:
+  ASN1_INTEGER_free(a_max_plus_one);
+  BN_free(bn);
+  return ret;
+}
+
+/*
+ * Check whether an ASIdentifier extension is in canonical form.
+ */
+int v3_asid_is_canonical(ASIdentifiers *asid)
+{
+  return (asid == NULL ||
+          (ASIdentifierChoice_is_canonical(asid->asnum) ||
+           ASIdentifierChoice_is_canonical(asid->rdi)));
+}
+
+/*
+ * Whack an ASIdentifierChoice into canonical form.
+ */
+static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
+{
+  ASN1_INTEGER *a_max_plus_one = NULL;
+  BIGNUM *bn = NULL;
+  int i, ret = 0;
+
+  /*
+   * Nothing to do for empty element or inheritance.
+   */
+  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)
+    return 1;
+
+  /*
+   * We have a list.  Sort it.
+   */
+  assert(choice->type == ASIdentifierChoice_asIdsOrRanges);
+  sk_ASIdOrRange_sort(choice->u.asIdsOrRanges);
+
+  /*
+   * Now check for errors and suboptimal encoding, rejecting the
+   * former and fixing the latter.
+   */
+  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
+    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
+    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;
+
+    extract_min_max(a, &a_min, &a_max);
+    extract_min_max(b, &b_min, &b_max);
+
+    /*
+     * Make sure we're properly sorted (paranoia).
+     */
+    assert(ASN1_INTEGER_cmp(a_min, b_min) <= 0);
+
+    /*
+     * Check for overlaps.
+     */
+    if (ASN1_INTEGER_cmp(a_max, b_min) >= 0) {
+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
+                X509V3_R_EXTENSION_VALUE_ERROR);
+      goto done;
+    }
+
+    /*
+     * Calculate a_max + 1 to check for adjacency.
+     */
+    if ((bn == NULL && (bn = BN_new()) == NULL) ||
+        ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
+        !BN_add_word(bn, 1) ||
+        (a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, ERR_R_MALLOC_FAILURE);
+      goto done;
+    }
+    
+    /*
+     * If a and b are adjacent, merge them.
+     */
+    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) == 0) {
+      ASRange *r;
+      switch (a->type) {
+      case ASIdOrRange_id:
+        if ((r = OPENSSL_malloc(sizeof(ASRange))) == NULL) {
+          X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
+                    ERR_R_MALLOC_FAILURE);
+          goto done;
+        }
+        r->min = a_min;
+        r->max = b_max;
+        a->type = ASIdOrRange_range;
+        a->u.range = r;
+        break;
+      case ASIdOrRange_range:
+        ASN1_INTEGER_free(a->u.range->max);
+        a->u.range->max = b_max;
+        break;
+      }
+      switch (b->type) {
+      case ASIdOrRange_id:
+        b->u.id = NULL;
+        break;
+      case ASIdOrRange_range:
+        b->u.range->max = NULL;
+        break;
+      }
+      ASIdOrRange_free(b);
+      sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);
+      i--;
+      continue;
+    }
+  }
+
+  assert(ASIdentifierChoice_is_canonical(choice)); /* Paranoia */
+
+  ret = 1;
+
+ done:
+  ASN1_INTEGER_free(a_max_plus_one);
+  BN_free(bn);
+  return ret;
+}
+
+/*
+ * Whack an ASIdentifier extension into canonical form.
+ */
+int v3_asid_canonize(ASIdentifiers *asid)
+{
+  return (asid == NULL ||
+          (ASIdentifierChoice_canonize(asid->asnum) &&
+           ASIdentifierChoice_canonize(asid->rdi)));
+}
+
+/*
+ * v2i method for an ASIdentifier extension.
+ */
+static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
+                               struct v3_ext_ctx *ctx,
+                               STACK_OF(CONF_VALUE) *values)
+{
+  ASIdentifiers *asid = NULL;
+  int i;
+
+  if ((asid = ASIdentifiers_new()) == NULL) {
+    X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+    return NULL;
+  }
+
+  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
+    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);
+    ASN1_INTEGER *min = NULL, *max = NULL;
+    int i1, i2, i3, is_range, which;
+
+    /*
+     * Figure out whether this is an AS or an RDI.
+     */
+    if (       !name_cmp(val->name, "AS")) {
+      which = V3_ASID_ASNUM;
+    } else if (!name_cmp(val->name, "RDI")) {
+      which = V3_ASID_RDI;
+    } else {
+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_EXTENSION_NAME_ERROR);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    /*
+     * Handle inheritance.
+     */
+    if (!strcmp(val->value, "inherit")) {
+      if (v3_asid_add_inherit(asid, which))
+        continue;
+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_INHERITANCE);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    /*
+     * Number, range, or mistake, pick it apart and figure out which.
+     */
+    i1 = strspn(val->value, "0123456789");
+    if (val->value[i1] == '\0') {
+      is_range = 0;
+    } else {
+      is_range = 1;
+      i2 = i1 + strspn(val->value + i1, " \t");
+      if (val->value[i2] != '-') {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASNUMBER);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      i2++;
+      i2 = i2 + strspn(val->value + i2, " \t");
+      i3 = i2 + strspn(val->value + i2, "0123456789");
+      if (val->value[i3] != '\0') {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASRANGE);
+        X509V3_conf_err(val);
+        goto err;
+      }
+    }
+
+    /*
+     * Syntax is ok, read and add it.
+     */
+    if (!is_range) {
+      if (!X509V3_get_value_int(val, &min)) {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+    } else {
+      char *s = BUF_strdup(val->value);
+      if (s == NULL) {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      s[i1] = '\0';
+      min = s2i_ASN1_INTEGER(NULL, s);
+      max = s2i_ASN1_INTEGER(NULL, s + i2);
+      OPENSSL_free(s);
+      if (min == NULL || max == NULL) {
+        ASN1_INTEGER_free(min);
+        ASN1_INTEGER_free(max);
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+    }
+    if (!v3_asid_add_id_or_range(asid, which, min, max)) {
+      ASN1_INTEGER_free(min);
+      ASN1_INTEGER_free(max);
+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+      goto err;
+    }
+  }
+
+  /*
+   * Canonize the result, then we're done.
+   */
+  if (!v3_asid_canonize(asid))
+    goto err;
+  return asid;
+
+ err:
+  ASIdentifiers_free(asid);
+  return NULL;
+}
+
+/*
+ * OpenSSL dispatch.
+ */
+const X509V3_EXT_METHOD v3_asid = {
+  NID_sbgp_autonomousSysNum,    /* nid */
+  0,                            /* flags */
+  ASN1_ITEM_ref(ASIdentifiers), /* template */
+  0, 0, 0, 0,                   /* old functions, ignored */
+  0,                            /* i2s */
+  0,                            /* s2i */
+  0,                            /* i2v */
+  v2i_ASIdentifiers,            /* v2i */
+  i2r_ASIdentifiers,            /* i2r */
+  0,                            /* r2i */
+  NULL                          /* extension-specific data */
+};
+
+/*
+ * Figure out whether extension uses inheritance.
+ */
+int v3_asid_inherits(ASIdentifiers *asid)
+{
+  return (asid != NULL &&
+          ((asid->asnum != NULL &&
+            asid->asnum->type == ASIdentifierChoice_inherit) ||
+           (asid->rdi != NULL &&
+            asid->rdi->type == ASIdentifierChoice_inherit)));
+}
+
+/*
+ * Figure out whether parent contains child.
+ */
+static int asid_contains(ASIdOrRanges *parent, ASIdOrRanges *child)
+{
+  ASN1_INTEGER *p_min, *p_max, *c_min, *c_max;
+  int p, c;
+
+  if (child == NULL || parent == child)
+    return 1;
+  if (parent == NULL)
+    return 0;
+
+  p = 0;
+  for (c = 0; c < sk_ASIdOrRange_num(child); c++) {
+    extract_min_max(sk_ASIdOrRange_value(child, c), &c_min, &c_max);
+    for (;; p++) {
+      if (p >= sk_ASIdOrRange_num(parent))
+        return 0;
+      extract_min_max(sk_ASIdOrRange_value(parent, p), &p_min, &p_max);
+      if (ASN1_INTEGER_cmp(p_max, c_max) < 0)
+        continue;
+      if (ASN1_INTEGER_cmp(p_min, c_min) > 0)
+        return 0;
+      break;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * Test whether a is a subet of b.
+ */
+int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b)
+{
+  return (a == NULL ||
+          a == b ||
+          (b != NULL &&
+           !v3_asid_inherits(a) &&
+           !v3_asid_inherits(b) &&
+           asid_contains(b->asnum->u.asIdsOrRanges,
+                         a->asnum->u.asIdsOrRanges) &&
+           asid_contains(b->rdi->u.asIdsOrRanges,
+                         a->rdi->u.asIdsOrRanges)));
+}
+
+/*
+ * Validation error handling via callback.
+ */
+#define validation_err(_err_)           \
+  do {                                  \
+    if (ctx != NULL) {                  \
+      ctx->error = _err_;               \
+      ctx->error_depth = i;             \
+      ctx->current_cert = x;            \
+      ret = ctx->verify_cb(0, ctx);     \
+    } else {                            \
+      ret = 0;                          \
+    }                                   \
+    if (!ret)                           \
+      goto done;                        \
+  } while (0)
+
+/*
+ * Core code for RFC 3779 3.3 path validation.
+ */
+static int v3_asid_validate_path_internal(X509_STORE_CTX *ctx,
+                                          STACK_OF(X509) *chain,
+                                          ASIdentifiers *ext)
+{
+  ASIdOrRanges *child_as = NULL, *child_rdi = NULL;
+  int i, ret = 1, inherit_as = 0, inherit_rdi = 0;
+  X509 *x;
+
+  assert(chain != NULL && sk_X509_num(chain) > 0);
+  assert(ctx != NULL || ext != NULL);
+  assert(ctx == NULL || ctx->verify_cb != NULL);
+
+  /*
+   * Figure out where to start.  If we don't have an extension to
+   * check, we're done.  Otherwise, check canonical form and
+   * set up for walking up the chain.
+   */
+  if (ext != NULL) {
+    i = -1;
+    x = NULL;
+  } else {
+    i = 0;
+    x = sk_X509_value(chain, i);
+    assert(x != NULL);
+    if ((ext = x->rfc3779_asid) == NULL)
+      goto done;
+  }
+  if (!v3_asid_is_canonical(ext))
+    validation_err(X509_V_ERR_INVALID_EXTENSION);
+  if (ext->asnum != NULL)  {
+    switch (ext->asnum->type) {
+    case ASIdentifierChoice_inherit:
+      inherit_as = 1;
+      break;
+    case ASIdentifierChoice_asIdsOrRanges:
+      child_as = ext->asnum->u.asIdsOrRanges;
+      break;
+    }
+  }
+  if (ext->rdi != NULL) {
+    switch (ext->rdi->type) {
+    case ASIdentifierChoice_inherit:
+      inherit_rdi = 1;
+      break;
+    case ASIdentifierChoice_asIdsOrRanges:
+      child_rdi = ext->rdi->u.asIdsOrRanges;
+      break;
+    }
+  }
+
+  /*
+   * Now walk up the chain.  Extensions must be in canonical form, no
+   * cert may list resources that its parent doesn't list.
+   */
+  for (i++; i < sk_X509_num(chain); i++) {
+    x = sk_X509_value(chain, i);
+    assert(x != NULL);
+    if (x->rfc3779_asid == NULL) {
+      if (child_as != NULL || child_rdi != NULL)
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      continue;
+    }
+    if (!v3_asid_is_canonical(x->rfc3779_asid))
+      validation_err(X509_V_ERR_INVALID_EXTENSION);
+    if (x->rfc3779_asid->asnum == NULL && child_as != NULL) {
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      child_as = NULL;
+      inherit_as = 0;
+    }
+    if (x->rfc3779_asid->asnum != NULL &&
+        x->rfc3779_asid->asnum->type == ASIdentifierChoice_asIdsOrRanges) {
+      if (inherit_as ||
+          asid_contains(x->rfc3779_asid->asnum->u.asIdsOrRanges, child_as)) {
+        child_as = x->rfc3779_asid->asnum->u.asIdsOrRanges;
+        inherit_as = 0;
+      } else {
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      }
+    }
+    if (x->rfc3779_asid->rdi == NULL && child_rdi != NULL) {
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      child_rdi = NULL;
+      inherit_rdi = 0;
+    }
+    if (x->rfc3779_asid->rdi != NULL &&
+        x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {
+      if (inherit_rdi ||
+          asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges, child_rdi)) {
+        child_rdi = x->rfc3779_asid->rdi->u.asIdsOrRanges;
+        inherit_rdi = 0;
+      } else {
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      }
+    }
+  }
+
+  /*
+   * Trust anchor can't inherit.
+   */
+  assert(x != NULL);
+  if (x->rfc3779_asid != NULL) {
+    if (x->rfc3779_asid->asnum != NULL &&
+        x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+    if (x->rfc3779_asid->rdi != NULL &&
+        x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+  }
+
+ done:
+  return ret;
+}
+
+#undef validation_err
+
+/*
+ * RFC 3779 3.3 path validation -- called from X509_verify_cert().
+ */
+int v3_asid_validate_path(X509_STORE_CTX *ctx)
+{
+  return v3_asid_validate_path_internal(ctx, ctx->chain, NULL);
+}
+
+/*
+ * RFC 3779 3.3 path validation of an extension.
+ * Test whether chain covers extension.
+ */
+int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
+                                  ASIdentifiers *ext,
+                                  int allow_inheritance)
+{
+  if (ext == NULL)
+    return 1;
+  if (chain == NULL || sk_X509_num(chain) == 0)
+    return 0;
+  if (!allow_inheritance && v3_asid_inherits(ext))
+    return 0;
+  return v3_asid_validate_path_internal(NULL, chain, ext);
+}
+
+#endif /* OPENSSL_NO_RFC3779 */
diff --git a/src/lib/libcrypto/rc4/rc4_fblk.c b/src/lib/libssl/src/crypto/asn1/x_nx509.c
index 1b2a42979b..fbd9a22db3 100644
--- a/src/lib/libcrypto/rc4/rc4_fblk.c
+++ b/src/lib/libssl/src/crypto/asn1/x_nx509.c
@@ -1,9 +1,9 @@
-/* crypto/rc4/rc4_fblk.c */
+/* x_nx509.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
+ * project 2005.
  */
 /* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -49,27 +49,24 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
  */
 
+#include <stddef.h>
+#include <openssl/x509.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
 
-#include <openssl/rc4.h>
-#include "rc4_locl.h"
-#include <openssl/opensslv.h>
-#include <openssl/crypto.h>
-#ifdef OPENSSL_FIPS
-#include <openssl/fips.h>
-#endif
+/* Old netscape certificate wrapper format */
 
-/* FIPS mode blocking for RC4 has to be done separately since RC4_set_key
- * may be implemented in an assembly language file.
- */
+ASN1_SEQUENCE(NETSCAPE_X509) = {
+        ASN1_SIMPLE(NETSCAPE_X509, header, ASN1_OCTET_STRING),
+        ASN1_OPT(NETSCAPE_X509, cert, X509)
+} ASN1_SEQUENCE_END(NETSCAPE_X509)
 
-#ifdef OPENSSL_FIPS
-void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
-        {
-        if (FIPS_mode())
-                FIPS_BAD_ABORT(RC4)
-        private_RC4_set_key(key, len, data);
-        }
-#endif
+IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_X509)
 
diff --git a/src/lib/libcrypto/engine/hw_sureware_err.h b/src/lib/libssl/src/crypto/ecdh/ecdh.h
index bc52af5e05..b4b58ee65b 100644
--- a/src/lib/libcrypto/engine/hw_sureware_err.h
+++ b/src/lib/libssl/src/crypto/ecdh/ecdh.h
@@ -1,5 +1,20 @@
+/* crypto/ecdh/ecdh.h */
 /* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -16,12 +31,12 @@
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
  *
  * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
+ *    licensing@OpenSSL.org.
  *
  * 5. Products derived from this software may not be called "OpenSSL"
  *    nor may "OpenSSL" appear in their names without prior written
@@ -30,7 +45,7 @@
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
  *
  * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -51,42 +66,56 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
+#ifndef HEADER_ECDH_H
+#define HEADER_ECDH_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_ECDH
+#error ECDH is disabled.
+#endif
+
+#include <openssl/ec.h>
+#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const ECDH_METHOD *ECDH_OpenSSL(void);
+
+void      ECDH_set_default_method(const ECDH_METHOD *);
+const ECDH_METHOD *ECDH_get_default_method(void);
+int       ECDH_set_method(EC_KEY *, const ECDH_METHOD *);
+
+int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
+                     void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
+
+int       ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
+                *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int       ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
+void      *ECDH_get_ex_data(EC_KEY *d, int idx);
 
-#ifndef HEADER_SUREWARE_ERR_H
-#define HEADER_SUREWARE_ERR_H
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
-static void ERR_load_SUREWARE_strings(void);
-static void ERR_unload_SUREWARE_strings(void);
-static void ERR_SUREWARE_error(int function, int reason, char *file, int line);
-#define SUREWAREerr(f,r) ERR_SUREWARE_error((f),(r),__FILE__,__LINE__)
+void ERR_load_ECDH_strings(void);
 
-/* Error codes for the SUREWARE functions. */
+/* Error codes for the ECDH functions. */
 
 /* Function codes. */
-#define SUREWARE_F_SUREWAREHK_CTRL                       100
-#define SUREWARE_F_SUREWAREHK_DSA_DO_SIGN                101
-#define SUREWARE_F_SUREWAREHK_EX_FREE                    102
-#define SUREWARE_F_SUREWAREHK_FINISH                     103
-#define SUREWARE_F_SUREWAREHK_INIT                       104
-#define SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY           105
-#define SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY            106
-#define SUREWARE_F_SUREWAREHK_MOD_EXP                    107
-#define SUREWARE_F_SUREWAREHK_RAND_BYTES                 108
-#define SUREWARE_F_SUREWAREHK_RAND_SEED                  109
-#define SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC               110
-#define SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC               111
+#define ECDH_F_ECDH_COMPUTE_KEY                          100
+#define ECDH_F_ECDH_DATA_NEW_METHOD                      101
 
 /* Reason codes. */
-#define SUREWARE_R_BIO_WAS_FREED                         100
-#define SUREWARE_R_MISSING_KEY_COMPONENTS                105
-#define SUREWARE_R_REQUEST_FAILED                        101
-#define SUREWARE_R_REQUEST_FALLBACK                      102
-#define SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL           103
-#define SUREWARE_R_UNIT_FAILURE                          104
+#define ECDH_R_KDF_FAILED                                102
+#define ECDH_R_NO_PRIVATE_VALUE                          100
+#define ECDH_R_POINT_ARITHMETIC_FAILURE                  101
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libcrypto/evp/dig_eng.c b/src/lib/libssl/src/crypto/evp/m_ecdsa.c
index 64cdf9366c..8d87a49ebe 100644
--- a/src/lib/libcrypto/evp/dig_eng.c
+++ b/src/lib/libssl/src/crypto/evp/m_ecdsa.c
@@ -1,4 +1,57 @@
-/* crypto/evp/digest.c */
+/* crypto/evp/m_ecdsa.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -55,126 +108,41 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/objects.h>
 #include <openssl/evp.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include "evp_locl.h"
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
-#ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_SHA
+static int init(EVP_MD_CTX *ctx)
+        { return SHA1_Init(ctx->md_data); }
 
-#ifdef OPENSSL_FIPS
+static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
+        { return SHA1_Update(ctx->md_data,data,count); }
 
-static int do_evp_md_engine_full(EVP_MD_CTX *ctx, const EVP_MD **ptype, ENGINE *impl)
+static int final(EVP_MD_CTX *ctx,unsigned char *md)
+        { return SHA1_Final(md,ctx->md_data); }
+
+static const EVP_MD ecdsa_md=
         {
-        if (*ptype)
-                {
-                /* Ensure an ENGINE left lying around from last time is cleared
-                 * (the previous check attempted to avoid this if the same
-                 * ENGINE and EVP_MD could be used). */
-                if(ctx->engine)
-                        ENGINE_finish(ctx->engine);
-                if(impl)
-                        {
-                        if (!ENGINE_init(impl))
-                                {
-                                EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION_ERROR);
-                                return 0;
-                                }
-                        }
-                else
-                        /* Ask if an ENGINE is reserved for this job */
-                        impl = ENGINE_get_digest_engine((*ptype)->type);
-                if(impl)
-                        {
-                        /* There's an ENGINE for this job ... (apparently) */
-                        const EVP_MD *d = ENGINE_get_digest(impl, (*ptype)->type);
-                        if(!d)
-                                {
-                                /* Same comment from evp_enc.c */
-                                EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_INITIALIZATION_ERROR);
-                                return 0;
-                                }
-                        /* We'll use the ENGINE's private digest definition */
-                        *ptype = d;
-                        /* Store the ENGINE functional reference so we know
-                         * 'type' came from an ENGINE and we need to release
-                         * it when done. */
-                        ctx->engine = impl;
-                        }
-                else
-                        ctx->engine = NULL;
-                }
-        else
-        if(!ctx->digest)
-                {
-                EVPerr(EVP_F_DO_EVP_MD_ENGINE_FULL,EVP_R_NO_DIGEST_SET);
-                return 0;
-                }
-        return 1;
-        }
+        NID_ecdsa_with_SHA1,
+        NID_ecdsa_with_SHA1,
+        SHA_DIGEST_LENGTH,
+        EVP_MD_FLAG_PKEY_DIGEST,
+        init,
+        update,
+        final,
+        NULL,
+        NULL,
+        EVP_PKEY_ECDSA_method,
+        SHA_CBLOCK,
+        sizeof(EVP_MD *)+sizeof(SHA_CTX),
+        };
 
-void int_EVP_MD_init_engine_callbacks(void)
+const EVP_MD *EVP_ecdsa(void)
         {
-        int_EVP_MD_set_engine_callbacks(
-                ENGINE_init, ENGINE_finish, do_evp_md_engine_full);
+        return(&ecdsa_md);
         }
 #endif
-#endif
diff --git a/src/lib/libcrypto/ec/ec2_smpt.c b/src/lib/libssl/src/crypto/rsa/rsa_depr.c
index 59d52bf663..a859ded987 100644
--- a/src/lib/libcrypto/ec/ec2_smpt.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_depr.c
@@ -1,7 +1,4 @@
-/* crypto/ec/ec2_smpt.c */
-/* This code was originally written by Douglas Stebila 
- * <dstebila@student.math.uwaterloo.ca> for the OpenSSL project.
- */
+/* crypto/rsa/rsa_depr.c */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -56,19 +53,49 @@
  *
  */
 
+/* NB: This file contains deprecated functions (compatibility wrappers to the
+ * "new" versions). */
 
-/* Calaculates and sets the affine coordinates of an EC_POINT from the given
- * compressed coordinates.  Uses algorithm 2.3.4 of SEC 1. 
- * Note that the simple implementation only uses affine coordinates.
- *
- * This algorithm is patented by Certicom Corp. under US Patent 6,141,420
- * (for licensing information, contact licensing@certicom.com).
- * This function is disabled by default and can be enabled by defining the 
- * preprocessor macro OPENSSL_EC_BIN_PT_COMP at Configure-time.
- */
-int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-        const BIGNUM *x_, int y_bit, BN_CTX *ctx)
+#include <stdio.h>
+#include <time.h>
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+
+#ifdef OPENSSL_NO_DEPRECATED
+
+static void *dummy=&dummy;
+
+#else
+
+RSA *RSA_generate_key(int bits, unsigned long e_value,
+             void (*callback)(int,int,void *), void *cb_arg)
         {
-        ECerr(EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_DISABLED);
+        BN_GENCB cb;
+        int i;
+        RSA *rsa = RSA_new();
+        BIGNUM *e = BN_new();
+
+        if(!rsa || !e) goto err;
+
+        /* The problem is when building with 8, 16, or 32 BN_ULONG,
+         * unsigned long can be larger */
+        for (i=0; i<(int)sizeof(unsigned long)*8; i++)
+                {
+                if (e_value & (1UL<<i))
+                        if (BN_set_bit(e,i) == 0)
+                                goto err;
+                }
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if(RSA_generate_key_ex(rsa, bits, e, &cb)) {
+                BN_free(e);
+                return rsa;
+        }
+err:
+        if(e) BN_free(e);
+        if(rsa) RSA_free(rsa);
         return 0;
         }
+#endif
diff --git a/src/lib/libcrypto/engine/hw_4758_cca_err.c b/src/lib/libssl/src/engines/e_4758cca_err.c
index 7ea5c63707..6ecdc6e627 100644
--- a/src/lib/libcrypto/engine/hw_4758_cca_err.c
+++ b/src/lib/libssl/src/engines/e_4758cca_err.c
@@ -1,6 +1,6 @@
-/* hw_4758_cca_err.c */
+/* e_4758cca_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,34 +60,38 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_4758_cca_err.h"
+#include "e_4758cca_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA CCA4758_str_functs[]=
         {
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_CTRL,0),     "IBM_4758_CCA_CTRL"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_FINISH,0),   "IBM_4758_CCA_FINISH"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_INIT,0),     "IBM_4758_CCA_INIT"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,0),     "IBM_4758_CCA_LOAD_PRIVKEY"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_LOAD_PUBKEY,0),      "IBM_4758_CCA_LOAD_PUBKEY"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_SIGN,0),     "IBM_4758_CCA_SIGN"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_VERIFY,0),   "IBM_4758_CCA_VERIFY"},
+{ERR_FUNC(CCA4758_F_CCA_RSA_SIGN),      "CCA_RSA_SIGN"},
+{ERR_FUNC(CCA4758_F_CCA_RSA_VERIFY),    "CCA_RSA_VERIFY"},
+{ERR_FUNC(CCA4758_F_IBM_4758_CCA_CTRL), "IBM_4758_CCA_CTRL"},
+{ERR_FUNC(CCA4758_F_IBM_4758_CCA_FINISH),       "IBM_4758_CCA_FINISH"},
+{ERR_FUNC(CCA4758_F_IBM_4758_CCA_INIT), "IBM_4758_CCA_INIT"},
+{ERR_FUNC(CCA4758_F_IBM_4758_LOAD_PRIVKEY),     "IBM_4758_LOAD_PRIVKEY"},
+{ERR_FUNC(CCA4758_F_IBM_4758_LOAD_PUBKEY),      "IBM_4758_LOAD_PUBKEY"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA CCA4758_str_reasons[]=
         {
-{CCA4758_R_ALREADY_LOADED                ,"already loaded"},
-{CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD       ,"asn1 oid unknown for md"},
-{CCA4758_R_COMMAND_NOT_IMPLEMENTED       ,"command not implemented"},
-{CCA4758_R_DSO_FAILURE                   ,"dso failure"},
-{CCA4758_R_FAILED_LOADING_PRIVATE_KEY    ,"failed loading private key"},
-{CCA4758_R_FAILED_LOADING_PUBLIC_KEY     ,"failed loading public key"},
-{CCA4758_R_NOT_LOADED                    ,"not loaded"},
-{CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL   ,"size too large or too small"},
-{CCA4758_R_UNIT_FAILURE                  ,"unit failure"},
-{CCA4758_R_UNKNOWN_ALGORITHM_TYPE        ,"unknown algorithm type"},
+{ERR_REASON(CCA4758_R_ALREADY_LOADED)    ,"already loaded"},
+{ERR_REASON(CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD),"asn1 oid unknown for md"},
+{ERR_REASON(CCA4758_R_COMMAND_NOT_IMPLEMENTED),"command not implemented"},
+{ERR_REASON(CCA4758_R_DSO_FAILURE)       ,"dso failure"},
+{ERR_REASON(CCA4758_R_FAILED_LOADING_PRIVATE_KEY),"failed loading private key"},
+{ERR_REASON(CCA4758_R_FAILED_LOADING_PUBLIC_KEY),"failed loading public key"},
+{ERR_REASON(CCA4758_R_NOT_LOADED)        ,"not loaded"},
+{ERR_REASON(CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL),"size too large or too small"},
+{ERR_REASON(CCA4758_R_UNIT_FAILURE)      ,"unit failure"},
+{ERR_REASON(CCA4758_R_UNKNOWN_ALGORITHM_TYPE),"unknown algorithm type"},
 {0,NULL}
         };
 
diff --git a/src/lib/libcrypto/engine/hw_4758_cca_err.h b/src/lib/libssl/src/engines/e_4758cca_err.h
index 2fc563ab11..26087edbfa 100644
--- a/src/lib/libcrypto/engine/hw_4758_cca_err.h
+++ b/src/lib/libssl/src/engines/e_4758cca_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_CCA4758_ERR_H
 #define HEADER_CCA4758_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -67,13 +71,13 @@ static void ERR_CCA4758_error(int function, int reason, char *file, int line);
 /* Error codes for the CCA4758 functions. */
 
 /* Function codes. */
+#define CCA4758_F_CCA_RSA_SIGN                           105
+#define CCA4758_F_CCA_RSA_VERIFY                         106
 #define CCA4758_F_IBM_4758_CCA_CTRL                      100
 #define CCA4758_F_IBM_4758_CCA_FINISH                    101
 #define CCA4758_F_IBM_4758_CCA_INIT                      102
-#define CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY              103
-#define CCA4758_F_IBM_4758_CCA_LOAD_PUBKEY               104
-#define CCA4758_F_IBM_4758_CCA_SIGN                      105
-#define CCA4758_F_IBM_4758_CCA_VERIFY                    106
+#define CCA4758_F_IBM_4758_LOAD_PRIVKEY                  103
+#define CCA4758_F_IBM_4758_LOAD_PUBKEY                   104
 
 /* Reason codes. */
 #define CCA4758_R_ALREADY_LOADED                         100
diff --git a/src/lib/libcrypto/engine/hw_aep_err.h b/src/lib/libssl/src/engines/e_aep_err.h
index 8fe4cf921f..35b2e74260 100644
--- a/src/lib/libcrypto/engine/hw_aep_err.h
+++ b/src/lib/libssl/src/engines/e_aep_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_AEPHK_ERR_H
 #define HEADER_AEPHK_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
diff --git a/src/lib/libcrypto/engine/hw_atalla.c b/src/lib/libssl/src/engines/e_atalla.c
index 2b8342bbdd..fabaa86a52 100644
--- a/src/lib/libcrypto/engine/hw_atalla.c
+++ b/src/lib/libssl/src/engines/e_atalla.c
@@ -57,10 +57,21 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_ATALLA
@@ -72,12 +83,12 @@
 #endif
 
 #define ATALLA_LIB_NAME "atalla engine"
-#include "hw_atalla_err.c"
+#include "e_atalla_err.c"
 
 static int atalla_destroy(ENGINE *e);
 static int atalla_init(ENGINE *e);
 static int atalla_finish(ENGINE *e);
-static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 
 /* BIGNUM stuff */
 static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -85,11 +96,11 @@ static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 
 #ifndef OPENSSL_NO_RSA
 /* RSA stuff */
-static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-#endif
+static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int atalla_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+#endif
 
 #ifndef OPENSSL_NO_DSA
 /* DSA stuff */
@@ -135,6 +146,7 @@ static RSA_METHOD atalla_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -152,7 +164,9 @@ static DSA_METHOD atalla_dsa =
         NULL, /* init */
         NULL, /* finish */
         0, /* flags */
-        NULL /* app_data */
+        NULL, /* app_data */
+        NULL, /* dsa_paramgen */
+        NULL /* dsa_keygen */
         };
 #endif
 
@@ -167,6 +181,7 @@ static DH_METHOD atalla_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -242,7 +257,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_atalla(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -402,7 +417,7 @@ static int atalla_finish(ENGINE *e)
         return 1;
         }
 
-static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((atalla_dso == NULL) ? 0 : 1);
         switch(cmd)
@@ -498,9 +513,8 @@ err:
         }
 
 #ifndef OPENSSL_NO_RSA
-static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        BN_CTX *ctx = NULL;
         int to_return = 0;
 
         if(!atalla_dso)
@@ -508,8 +522,6 @@ static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
                 ATALLAerr(ATALLA_F_ATALLA_RSA_MOD_EXP,ATALLA_R_NOT_LOADED);
                 goto err;
                 }
-        if((ctx = BN_CTX_new()) == NULL)
-                goto err;
         if(!rsa->d || !rsa->n)
                 {
                 ATALLAerr(ATALLA_F_ATALLA_RSA_MOD_EXP,ATALLA_R_MISSING_KEY_COMPONENTS);
@@ -517,8 +529,6 @@ static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
                 }
         to_return = atalla_mod_exp(r0, I, rsa->d, rsa->n, ctx);
 err:
-        if(ctx)
-                BN_CTX_free(ctx);
         return to_return;
         }
 #endif
@@ -559,12 +569,14 @@ static int atalla_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
         }
 #endif
 
+#ifndef OPENSSL_NO_RSA
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int atalla_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
         {
         return atalla_mod_exp(r, a, p, m, ctx);
         }
+#endif
 
 #ifndef OPENSSL_NO_DH
 /* This function is aliased to mod_exp (with the dh and mont dropped). */
@@ -578,7 +590,7 @@ static int atalla_mod_exp_dh(const DH *dh, BIGNUM *r,
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_atalla_id) != 0))
@@ -589,7 +601,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_ATALLA */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/hw_atalla_err.h b/src/lib/libssl/src/engines/e_atalla_err.h
index cdac052d8c..36e09bf42f 100644
--- a/src/lib/libcrypto/engine/hw_atalla_err.h
+++ b/src/lib/libssl/src/engines/e_atalla_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_ATALLA_ERR_H
 #define HEADER_ATALLA_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
diff --git a/src/lib/libcrypto/engine/hw_ncipher_err.c b/src/lib/libssl/src/engines/e_chil_err.c
index 5bc94581b7..c5983b2fd5 100644
--- a/src/lib/libcrypto/engine/hw_ncipher_err.c
+++ b/src/lib/libssl/src/engines/e_chil_err.c
@@ -1,6 +1,6 @@
-/* hw_ncipher_err.c */
+/* e_chil_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,42 +60,45 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_ncipher_err.h"
+#include "e_chil_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA HWCRHK_str_functs[]=
         {
-{ERR_PACK(0,HWCRHK_F_HWCRHK_CTRL,0),    "HWCRHK_CTRL"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_FINISH,0),  "HWCRHK_FINISH"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_GET_PASS,0),        "HWCRHK_GET_PASS"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_INIT,0),    "HWCRHK_INIT"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_INSERT_CARD,0),     "HWCRHK_INSERT_CARD"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_LOAD_PRIVKEY,0),    "HWCRHK_LOAD_PRIVKEY"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_LOAD_PUBKEY,0),     "HWCRHK_LOAD_PUBKEY"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_MOD_EXP,0), "HWCRHK_MOD_EXP"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_RAND_BYTES,0),      "HWCRHK_RAND_BYTES"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_RSA_MOD_EXP,0),     "HWCRHK_RSA_MOD_EXP"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_CTRL),        "HWCRHK_CTRL"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_FINISH),      "HWCRHK_FINISH"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_GET_PASS),    "HWCRHK_GET_PASS"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_INIT),        "HWCRHK_INIT"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_INSERT_CARD), "HWCRHK_INSERT_CARD"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_LOAD_PRIVKEY),        "HWCRHK_LOAD_PRIVKEY"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_LOAD_PUBKEY), "HWCRHK_LOAD_PUBKEY"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_MOD_EXP),     "HWCRHK_MOD_EXP"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_RAND_BYTES),  "HWCRHK_RAND_BYTES"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_RSA_MOD_EXP), "HWCRHK_RSA_MOD_EXP"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA HWCRHK_str_reasons[]=
         {
-{HWCRHK_R_ALREADY_LOADED                 ,"already loaded"},
-{HWCRHK_R_BIO_WAS_FREED                  ,"bio was freed"},
-{HWCRHK_R_CHIL_ERROR                     ,"chil error"},
-{HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED   ,"ctrl command not implemented"},
-{HWCRHK_R_DSO_FAILURE                    ,"dso failure"},
-{HWCRHK_R_DYNAMIC_LOCKING_MISSING        ,"dynamic locking missing"},
-{HWCRHK_R_MISSING_KEY_COMPONENTS         ,"missing key components"},
-{HWCRHK_R_NOT_INITIALISED                ,"not initialised"},
-{HWCRHK_R_NOT_LOADED                     ,"not loaded"},
-{HWCRHK_R_NO_CALLBACK                    ,"no callback"},
-{HWCRHK_R_NO_KEY                         ,"no key"},
-{HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED,"private key algorithms disabled"},
-{HWCRHK_R_REQUEST_FAILED                 ,"request failed"},
-{HWCRHK_R_REQUEST_FALLBACK               ,"request fallback"},
-{HWCRHK_R_UNIT_FAILURE                   ,"unit failure"},
+{ERR_REASON(HWCRHK_R_ALREADY_LOADED)     ,"already loaded"},
+{ERR_REASON(HWCRHK_R_BIO_WAS_FREED)      ,"bio was freed"},
+{ERR_REASON(HWCRHK_R_CHIL_ERROR)         ,"chil error"},
+{ERR_REASON(HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(HWCRHK_R_DSO_FAILURE)        ,"dso failure"},
+{ERR_REASON(HWCRHK_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(HWCRHK_R_NOT_INITIALISED)    ,"not initialised"},
+{ERR_REASON(HWCRHK_R_NOT_LOADED)         ,"not loaded"},
+{ERR_REASON(HWCRHK_R_NO_CALLBACK)        ,"no callback"},
+{ERR_REASON(HWCRHK_R_NO_KEY)             ,"no key"},
+{ERR_REASON(HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED),"private key algorithms disabled"},
+{ERR_REASON(HWCRHK_R_REQUEST_FAILED)     ,"request failed"},
+{ERR_REASON(HWCRHK_R_REQUEST_FALLBACK)   ,"request fallback"},
+{ERR_REASON(HWCRHK_R_UNIT_FAILURE)       ,"unit failure"},
 {0,NULL}
         };
 
diff --git a/src/lib/libcrypto/engine/hw_cswift.c b/src/lib/libssl/src/engines/e_cswift.c
index 1411fd8333..bc65179846 100644
--- a/src/lib/libcrypto/engine/hw_cswift.c
+++ b/src/lib/libssl/src/engines/e_cswift.c
@@ -57,10 +57,22 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/rand.h>
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_CSWIFT
@@ -84,28 +96,34 @@
 #endif
 
 #define CSWIFT_LIB_NAME "cswift engine"
-#include "hw_cswift_err.c"
+#include "e_cswift_err.c"
+
+#define DECIMAL_SIZE(type)      ((sizeof(type)*8+2)/3+1)
 
 static int cswift_destroy(ENGINE *e);
 static int cswift_init(ENGINE *e);
 static int cswift_finish(ENGINE *e);
-static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
+#ifndef OPENSSL_NO_RSA
 static int cswift_bn_32copy(SW_LARGENUMBER * out, const BIGNUM * in);
+#endif
 
 /* BIGNUM stuff */
 static int cswift_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx);
+#ifndef OPENSSL_NO_RSA
 static int cswift_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *q, const BIGNUM *dmp1, const BIGNUM *dmq1,
                 const BIGNUM *iqmp, BN_CTX *ctx);
+#endif
 
 #ifndef OPENSSL_NO_RSA
 /* RSA stuff */
-static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-#endif
+static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int cswift_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+#endif
 
 #ifndef OPENSSL_NO_DSA
 /* DSA stuff */
@@ -152,6 +170,7 @@ static RSA_METHOD cswift_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -169,7 +188,9 @@ static DSA_METHOD cswift_dsa =
         NULL, /* init */
         NULL, /* finish */
         0, /* flags */
-        NULL /* app_data */
+        NULL, /* app_data */
+        NULL, /* dsa_paramgen */
+        NULL /* dsa_keygen */
         };
 #endif
 
@@ -184,6 +205,7 @@ static DH_METHOD cswift_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -260,7 +282,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_cswift(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -436,7 +458,7 @@ static int cswift_finish(ENGINE *e)
         return 1;
         }
 
-static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((cswift_dso == NULL) ? 0 : 1);
         switch(cmd)
@@ -558,6 +580,7 @@ err:
         }
 
 
+#ifndef OPENSSL_NO_RSA
 int cswift_bn_32copy(SW_LARGENUMBER * out, const BIGNUM * in)
 {
         int mod;
@@ -579,7 +602,9 @@ int cswift_bn_32copy(SW_LARGENUMBER * out, const BIGNUM * in)
 
         return 1;
 }
+#endif
 
+#ifndef OPENSSL_NO_RSA
 /* Un petit mod_exp chinois */
 static int cswift_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                         const BIGNUM *q, const BIGNUM *dmp1,
@@ -711,14 +736,20 @@ err:
                 release_context(hac);
         return to_return;
         }
+#endif
  
 #ifndef OPENSSL_NO_RSA
-static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        BN_CTX *ctx;
         int to_return = 0;
         const RSA_METHOD * def_rsa_method;
 
+        if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
+                {
+                CSWIFTerr(CSWIFT_F_CSWIFT_RSA_MOD_EXP,CSWIFT_R_MISSING_KEY_COMPONENTS);
+                goto err;
+                }
+
         /* Try the limits of RSA (2048 bits) */
         if(BN_num_bytes(rsa->p) > 128 ||
                 BN_num_bytes(rsa->q) > 128 ||
@@ -736,24 +767,14 @@ static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
 #endif
 #endif
                 if(def_rsa_method)
-                        return def_rsa_method->rsa_mod_exp(r0, I, rsa);
+                        return def_rsa_method->rsa_mod_exp(r0, I, rsa, ctx);
         }
 
-        if((ctx = BN_CTX_new()) == NULL)
-                goto err;
-        if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
-                {
-                CSWIFTerr(CSWIFT_F_CSWIFT_RSA_MOD_EXP,CSWIFT_R_MISSING_KEY_COMPONENTS);
-                goto err;
-                }
         to_return = cswift_mod_exp_crt(r0, I, rsa->p, rsa->q, rsa->dmp1,
                 rsa->dmq1, rsa->iqmp, ctx);
 err:
-        if(ctx)
-                BN_CTX_free(ctx);
         return to_return;
         }
-#endif
 
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int cswift_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -781,6 +802,7 @@ static int cswift_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 
         return cswift_mod_exp(r, a, p, m, ctx);
         }
+#endif  /* OPENSSL_NO_RSA */
 
 #ifndef OPENSSL_NO_DSA
 static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa)
@@ -1030,7 +1052,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
 
         if (!get_context(&hac))
         {
-                CSWIFTerr(CSWIFT_F_CSWIFT_CTRL, CSWIFT_R_UNIT_FAILURE);
+                CSWIFTerr(CSWIFT_F_CSWIFT_RAND_BYTES, CSWIFT_R_UNIT_FAILURE);
                 goto err;
         }
         acquired = 1;
@@ -1041,7 +1063,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
         /* limitation of cswift with values not a multiple of 32                */
         /************************************************************************/
 
-        while(num >= sizeof(buf32))
+        while(num >= (int)sizeof(buf32))
         {
                 largenum.value = buf;
                 largenum.nbytes = sizeof(buf32);
@@ -1052,7 +1074,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
                 if (swrc != SW_OK)
                 {
                         char tmpbuf[20];
-                        CSWIFTerr(CSWIFT_F_CSWIFT_CTRL, CSWIFT_R_REQUEST_FAILED);
+                        CSWIFTerr(CSWIFT_F_CSWIFT_RAND_BYTES, CSWIFT_R_REQUEST_FAILED);
                         sprintf(tmpbuf, "%ld", swrc);
                         ERR_add_error_data(2, "CryptoSwift error number is ", tmpbuf);
                         goto err;
@@ -1068,7 +1090,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
                 if (swrc != SW_OK)
                 {
                         char tmpbuf[20];
-                        CSWIFTerr(CSWIFT_F_CSWIFT_CTRL, CSWIFT_R_REQUEST_FAILED);
+                        CSWIFTerr(CSWIFT_F_CSWIFT_RAND_BYTES, CSWIFT_R_REQUEST_FAILED);
                         sprintf(tmpbuf, "%ld", swrc);
                         ERR_add_error_data(2, "CryptoSwift error number is ", tmpbuf);
                         goto err;
@@ -1092,7 +1114,7 @@ static int cswift_rand_status(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_cswift_id) != 0))
@@ -1103,7 +1125,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_CSWIFT */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/hw_cswift_err.h b/src/lib/libssl/src/engines/e_cswift_err.h
index 7120c3216f..69c2a9f874 100644
--- a/src/lib/libcrypto/engine/hw_cswift_err.h
+++ b/src/lib/libssl/src/engines/e_cswift_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_CSWIFT_ERR_H
 #define HEADER_CSWIFT_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -74,6 +78,7 @@ static void ERR_CSWIFT_error(int function, int reason, char *file, int line);
 #define CSWIFT_F_CSWIFT_INIT                             104
 #define CSWIFT_F_CSWIFT_MOD_EXP                          105
 #define CSWIFT_F_CSWIFT_MOD_EXP_CRT                      106
+#define CSWIFT_F_CSWIFT_RAND_BYTES                       108
 #define CSWIFT_F_CSWIFT_RSA_MOD_EXP                      107
 
 /* Reason codes. */
diff --git a/src/lib/libcrypto/engine/hw_nuron_err.h b/src/lib/libssl/src/engines/e_gmp_err.h
index a56bfdf303..dd05dfd800 100644
--- a/src/lib/libcrypto/engine/hw_nuron_err.h
+++ b/src/lib/libssl/src/engines/e_gmp_err.h
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2001-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -52,33 +52,32 @@
  *
  */
 
-#ifndef HEADER_NURON_ERR_H
-#define HEADER_NURON_ERR_H
+#ifndef HEADER_GMP_ERR_H
+#define HEADER_GMP_ERR_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
-static void ERR_load_NURON_strings(void);
-static void ERR_unload_NURON_strings(void);
-static void ERR_NURON_error(int function, int reason, char *file, int line);
-#define NURONerr(f,r) ERR_NURON_error((f),(r),__FILE__,__LINE__)
+static void ERR_load_GMP_strings(void);
+static void ERR_unload_GMP_strings(void);
+static void ERR_GMP_error(int function, int reason, char *file, int line);
+#define GMPerr(f,r) ERR_GMP_error((f),(r),__FILE__,__LINE__)
 
-/* Error codes for the NURON functions. */
+/* Error codes for the GMP functions. */
 
 /* Function codes. */
-#define NURON_F_NURON_CTRL                               100
-#define NURON_F_NURON_FINISH                             101
-#define NURON_F_NURON_INIT                               102
-#define NURON_F_NURON_MOD_EXP                            103
+#define GMP_F_E_GMP_CTRL                                 100
+#define GMP_F_E_GMP_RSA_MOD_EXP                          101
 
 /* Reason codes. */
-#define NURON_R_ALREADY_LOADED                           100
-#define NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED             101
-#define NURON_R_DSO_FAILURE                              102
-#define NURON_R_DSO_FUNCTION_NOT_FOUND                   103
-#define NURON_R_DSO_NOT_FOUND                            104
-#define NURON_R_NOT_LOADED                               105
+#define GMP_R_CTRL_COMMAND_NOT_IMPLEMENTED               100
+#define GMP_R_KEY_CONTEXT_ERROR                          101
+#define GMP_R_MISSING_KEY_COMPONENTS                     102
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libcrypto/engine/hw_nuron.c b/src/lib/libssl/src/engines/e_nuron.c
index fb9188bfe5..4c2537cbc3 100644
--- a/src/lib/libcrypto/engine/hw_nuron.c
+++ b/src/lib/libssl/src/engines/e_nuron.c
@@ -57,17 +57,27 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
-
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_NURON
 
 #define NURON_LIB_NAME "nuron engine"
-#include "hw_nuron_err.c"
+#include "e_nuron_err.c"
 
 static const char *NURON_LIBNAME = NULL;
 static const char *get_NURON_LIBNAME(void)
@@ -155,7 +165,7 @@ static int nuron_finish(ENGINE *e)
         return 1;
         }
 
-static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((pvDSOHandle == NULL) ? 0 : 1);
         switch(cmd)
@@ -191,9 +201,9 @@ static int nuron_mod_exp(BIGNUM *r,const BIGNUM *a,const BIGNUM *p,
         }
 
 #ifndef OPENSSL_NO_RSA
-static int nuron_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int nuron_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        return nuron_mod_exp(r0,I,rsa->d,rsa->n,NULL);
+        return nuron_mod_exp(r0,I,rsa->d,rsa->n,ctx);
         }
 #endif
 
@@ -238,11 +248,13 @@ static int nuron_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
 #endif
 
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
+#ifndef OPENSSL_NO_RSA
 static int nuron_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                               const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
         {
         return nuron_mod_exp(r, a, p, m, ctx);
         }
+#endif
 
 #ifndef OPENSSL_NO_DH
 /* This function is aliased to mod_exp (with the dh and mont dropped). */
@@ -269,6 +281,7 @@ static RSA_METHOD nuron_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -285,7 +298,9 @@ static DSA_METHOD nuron_dsa =
         NULL, /* init */
         NULL, /* finish */
         0, /* flags */
-        NULL /* app_data */
+        NULL, /* app_data */
+        NULL, /* dsa_paramgen */
+        NULL /* dsa_keygen */
         };
 #endif
 
@@ -299,6 +314,7 @@ static DH_METHOD nuron_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -374,7 +390,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_nuron(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -401,7 +417,7 @@ void ENGINE_load_nuron(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */      
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_nuron_id) != 0))
@@ -412,7 +428,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_NURON */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libcrypto/engine/hw_nuron_err.c b/src/lib/libssl/src/engines/e_nuron_err.c
index df9d7bde76..9a7864f42f 100644
--- a/src/lib/libcrypto/engine/hw_nuron_err.c
+++ b/src/lib/libssl/src/engines/e_nuron_err.c
@@ -1,6 +1,6 @@
-/* hw_nuron_err.c */
+/* e_nuron_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,27 +60,31 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_nuron_err.h"
+#include "e_nuron_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA NURON_str_functs[]=
         {
-{ERR_PACK(0,NURON_F_NURON_CTRL,0),      "NURON_CTRL"},
-{ERR_PACK(0,NURON_F_NURON_FINISH,0),    "NURON_FINISH"},
-{ERR_PACK(0,NURON_F_NURON_INIT,0),      "NURON_INIT"},
-{ERR_PACK(0,NURON_F_NURON_MOD_EXP,0),   "NURON_MOD_EXP"},
+{ERR_FUNC(NURON_F_NURON_CTRL),  "NURON_CTRL"},
+{ERR_FUNC(NURON_F_NURON_FINISH),        "NURON_FINISH"},
+{ERR_FUNC(NURON_F_NURON_INIT),  "NURON_INIT"},
+{ERR_FUNC(NURON_F_NURON_MOD_EXP),       "NURON_MOD_EXP"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA NURON_str_reasons[]=
         {
-{NURON_R_ALREADY_LOADED                  ,"already loaded"},
-{NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED    ,"ctrl command not implemented"},
-{NURON_R_DSO_FAILURE                     ,"dso failure"},
-{NURON_R_DSO_FUNCTION_NOT_FOUND          ,"dso function not found"},
-{NURON_R_DSO_NOT_FOUND                   ,"dso not found"},
-{NURON_R_NOT_LOADED                      ,"not loaded"},
+{ERR_REASON(NURON_R_ALREADY_LOADED)      ,"already loaded"},
+{ERR_REASON(NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(NURON_R_DSO_FAILURE)         ,"dso failure"},
+{ERR_REASON(NURON_R_DSO_FUNCTION_NOT_FOUND),"dso function not found"},
+{ERR_REASON(NURON_R_DSO_NOT_FOUND)       ,"dso not found"},
+{ERR_REASON(NURON_R_NOT_LOADED)          ,"not loaded"},
 {0,NULL}
         };
 
diff --git a/src/lib/libcrypto/engine/hw_sureware_err.c b/src/lib/libssl/src/engines/e_sureware_err.c
index 69955dadbb..d4ca68c1db 100644
--- a/src/lib/libcrypto/engine/hw_sureware_err.c
+++ b/src/lib/libssl/src/engines/e_sureware_err.c
@@ -1,6 +1,6 @@
-/* hw_sureware_err.c */
+/* e_sureware_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,35 +60,43 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_sureware_err.h"
+#include "e_sureware_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA SUREWARE_str_functs[]=
         {
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_CTRL,0),      "SUREWAREHK_CTRL"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,0),       "SUREWAREHK_DSA_DO_SIGN"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_EX_FREE,0),   "SUREWAREHK_EX_FREE"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_FINISH,0),    "SUREWAREHK_FINISH"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_INIT,0),      "SUREWAREHK_INIT"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,0),  "SUREWAREHK_LOAD_PRIVATE_KEY"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,0),   "SUREWAREHK_LOAD_PUBLIC_KEY"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_MOD_EXP,0),   "SUREWAREHK_MOD_EXP"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RAND_BYTES,0),        "SUREWAREHK_RAND_BYTES"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RAND_SEED,0), "SUREWAREHK_RAND_SEED"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,0),      "SUREWAREHK_RSA_PRIV_DEC"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,0),      "SUREWAREHK_RSA_PRIV_ENC"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_CTRL),  "SUREWAREHK_CTRL"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_DH_EX_FREE),    "SUREWAREHK_DH_EX_FREE"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_DSA_DO_SIGN),   "SUREWAREHK_DSA_DO_SIGN"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_EX_FREE),       "SUREWAREHK_EX_FREE"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_FINISH),        "SUREWAREHK_FINISH"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_INIT),  "SUREWAREHK_INIT"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_LOAD_PRIVKEY),  "SUREWAREHK_LOAD_PRIVKEY"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_LOAD_PUBKEY),   "SUREWAREHK_LOAD_PUBKEY"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_MODEXP),        "SUREWAREHK_MODEXP"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RAND_BYTES),    "SUREWAREHK_RAND_BYTES"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RAND_SEED),     "SUREWAREHK_RAND_SEED"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC),  "SUREWAREHK_RSA_PRIV_DEC"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RSA_SIGN),      "SUREWAREHK_RSA_SIGN"},
+{ERR_FUNC(SUREWARE_F_SUREWARE_LOAD_PUBLIC),     "SUREWARE_LOAD_PUBLIC"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA SUREWARE_str_reasons[]=
         {
-{SUREWARE_R_BIO_WAS_FREED                ,"bio was freed"},
-{SUREWARE_R_MISSING_KEY_COMPONENTS       ,"missing key components"},
-{SUREWARE_R_REQUEST_FAILED               ,"request failed"},
-{SUREWARE_R_REQUEST_FALLBACK             ,"request fallback"},
-{SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL  ,"size too large or too small"},
-{SUREWARE_R_UNIT_FAILURE                 ,"unit failure"},
+{ERR_REASON(SUREWARE_R_BIO_WAS_FREED)    ,"bio was freed"},
+{ERR_REASON(SUREWARE_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(SUREWARE_R_PADDING_CHECK_FAILED),"padding check failed"},
+{ERR_REASON(SUREWARE_R_REQUEST_FAILED)   ,"request failed"},
+{ERR_REASON(SUREWARE_R_REQUEST_FALLBACK) ,"request fallback"},
+{ERR_REASON(SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL),"size too large or too small"},
+{ERR_REASON(SUREWARE_R_UNIT_FAILURE)     ,"unit failure"},
+{ERR_REASON(SUREWARE_R_UNKNOWN_PADDING_TYPE),"unknown padding type"},
 {0,NULL}
         };
 
diff --git a/src/lib/libcrypto/engine/hw_ubsec_err.c b/src/lib/libssl/src/engines/e_ubsec_err.c
index d707331fc2..14c3d61e24 100644
--- a/src/lib/libcrypto/engine/hw_ubsec_err.c
+++ b/src/lib/libssl/src/engines/e_ubsec_err.c
@@ -1,6 +1,6 @@
-/* hw_ubsec_err.c */
+/* e_ubsec_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,36 +60,42 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_ubsec_err.h"
+#include "e_ubsec_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA UBSEC_str_functs[]=
         {
-{ERR_PACK(0,UBSEC_F_UBSEC_CTRL,0),      "UBSEC_CTRL"},
-{ERR_PACK(0,UBSEC_F_UBSEC_DH_COMPUTE_KEY,0),    "UBSEC_DH_COMPUTE_KEY"},
-{ERR_PACK(0,UBSEC_F_UBSEC_DSA_SIGN,0),  "UBSEC_DSA_SIGN"},
-{ERR_PACK(0,UBSEC_F_UBSEC_DSA_VERIFY,0),        "UBSEC_DSA_VERIFY"},
-{ERR_PACK(0,UBSEC_F_UBSEC_FINISH,0),    "UBSEC_FINISH"},
-{ERR_PACK(0,UBSEC_F_UBSEC_INIT,0),      "UBSEC_INIT"},
-{ERR_PACK(0,UBSEC_F_UBSEC_MOD_EXP,0),   "UBSEC_MOD_EXP"},
-{ERR_PACK(0,UBSEC_F_UBSEC_RNG_BYTES,0), "UBSEC_RNG_BYTES"},
-{ERR_PACK(0,UBSEC_F_UBSEC_RSA_MOD_EXP,0),       "UBSEC_RSA_MOD_EXP"},
-{ERR_PACK(0,UBSEC_F_UBSEC_RSA_MOD_EXP_CRT,0),   "UBSEC_RSA_MOD_EXP_CRT"},
+{ERR_FUNC(UBSEC_F_UBSEC_CTRL),  "UBSEC_CTRL"},
+{ERR_FUNC(UBSEC_F_UBSEC_DH_COMPUTE_KEY),        "UBSEC_DH_COMPUTE_KEY"},
+{ERR_FUNC(UBSEC_F_UBSEC_DH_GENERATE_KEY),       "UBSEC_DH_GENERATE_KEY"},
+{ERR_FUNC(UBSEC_F_UBSEC_DSA_DO_SIGN),   "UBSEC_DSA_DO_SIGN"},
+{ERR_FUNC(UBSEC_F_UBSEC_DSA_VERIFY),    "UBSEC_DSA_VERIFY"},
+{ERR_FUNC(UBSEC_F_UBSEC_FINISH),        "UBSEC_FINISH"},
+{ERR_FUNC(UBSEC_F_UBSEC_INIT),  "UBSEC_INIT"},
+{ERR_FUNC(UBSEC_F_UBSEC_MOD_EXP),       "UBSEC_MOD_EXP"},
+{ERR_FUNC(UBSEC_F_UBSEC_MOD_EXP_CRT),   "UBSEC_MOD_EXP_CRT"},
+{ERR_FUNC(UBSEC_F_UBSEC_RAND_BYTES),    "UBSEC_RAND_BYTES"},
+{ERR_FUNC(UBSEC_F_UBSEC_RSA_MOD_EXP),   "UBSEC_RSA_MOD_EXP"},
+{ERR_FUNC(UBSEC_F_UBSEC_RSA_MOD_EXP_CRT),       "UBSEC_RSA_MOD_EXP_CRT"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA UBSEC_str_reasons[]=
         {
-{UBSEC_R_ALREADY_LOADED                  ,"already loaded"},
-{UBSEC_R_BN_EXPAND_FAIL                  ,"bn expand fail"},
-{UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED    ,"ctrl command not implemented"},
-{UBSEC_R_DSO_FAILURE                     ,"dso failure"},
-{UBSEC_R_MISSING_KEY_COMPONENTS          ,"missing key components"},
-{UBSEC_R_NOT_LOADED                      ,"not loaded"},
-{UBSEC_R_REQUEST_FAILED                  ,"request failed"},
-{UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL     ,"size too large or too small"},
-{UBSEC_R_UNIT_FAILURE                    ,"unit failure"},
+{ERR_REASON(UBSEC_R_ALREADY_LOADED)      ,"already loaded"},
+{ERR_REASON(UBSEC_R_BN_EXPAND_FAIL)      ,"bn expand fail"},
+{ERR_REASON(UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(UBSEC_R_DSO_FAILURE)         ,"dso failure"},
+{ERR_REASON(UBSEC_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(UBSEC_R_NOT_LOADED)          ,"not loaded"},
+{ERR_REASON(UBSEC_R_REQUEST_FAILED)      ,"request failed"},
+{ERR_REASON(UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL),"size too large or too small"},
+{ERR_REASON(UBSEC_R_UNIT_FAILURE)        ,"unit failure"},
 {0,NULL}
         };
 
diff --git a/src/lib/libcrypto/engine/hw_ubsec_err.h b/src/lib/libssl/src/engines/e_ubsec_err.h
index 023d3be771..b10b2387f2 100644
--- a/src/lib/libcrypto/engine/hw_ubsec_err.h
+++ b/src/lib/libssl/src/engines/e_ubsec_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_UBSEC_ERR_H
 #define HEADER_UBSEC_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -69,12 +73,14 @@ static void ERR_UBSEC_error(int function, int reason, char *file, int line);
 /* Function codes. */
 #define UBSEC_F_UBSEC_CTRL                               100
 #define UBSEC_F_UBSEC_DH_COMPUTE_KEY                     101
-#define UBSEC_F_UBSEC_DSA_SIGN                           102
+#define UBSEC_F_UBSEC_DH_GENERATE_KEY                    111
+#define UBSEC_F_UBSEC_DSA_DO_SIGN                        102
 #define UBSEC_F_UBSEC_DSA_VERIFY                         103
 #define UBSEC_F_UBSEC_FINISH                             104
 #define UBSEC_F_UBSEC_INIT                               105
 #define UBSEC_F_UBSEC_MOD_EXP                            106
-#define UBSEC_F_UBSEC_RNG_BYTES                          107
+#define UBSEC_F_UBSEC_MOD_EXP_CRT                        110
+#define UBSEC_F_UBSEC_RAND_BYTES                         107
 #define UBSEC_F_UBSEC_RSA_MOD_EXP                        108
 #define UBSEC_F_UBSEC_RSA_MOD_EXP_CRT                    109
 
diff --git a/src/lib/libcrypto/engine/vendor_defns/aep.h b/src/lib/libssl/src/engines/vendor_defns/aep.h
index 2b2792d2d6..5e9754fe43 100644
--- a/src/lib/libcrypto/engine/vendor_defns/aep.h
+++ b/src/lib/libssl/src/engines/vendor_defns/aep.h
@@ -171,8 +171,8 @@ typedef AEP_RV t_AEP_GenRandom(AEP_CONNECTION_HNDL hConnection,
 #endif
 
 typedef AEP_RV t_AEP_Initialize(AEP_VOID_PTR pInitArgs);
-typedef AEP_RV t_AEP_Finalize();
-typedef AEP_RV t_AEP_SetBNCallBacks(AEP_RV (*GetBigNumSizeFunc)(),
-                                    AEP_RV (*MakeAEPBigNumFunc)(),
-                                    AEP_RV (*ConverAEPBigNumFunc)());
+typedef AEP_RV t_AEP_Finalize(void);
+typedef AEP_RV t_AEP_SetBNCallBacks(AEP_RV (*GetBigNumSizeFunc)(AEP_VOID_PTR ArbBigNum, AEP_U32* BigNumSize),
+                                    AEP_RV (*MakeAEPBigNumFunc)(AEP_VOID_PTR ArbBigNum, AEP_U32 BigNumSize, unsigned char* AEP_BigNum),
+                                    AEP_RV (*ConverAEPBigNumFunc)(void* ArbBigNum, AEP_U32 BigNumSize, unsigned char* AEP_BigNum));
 
diff --git a/src/lib/libcrypto/engine/vendor_defns/atalla.h b/src/lib/libssl/src/engines/vendor_defns/atalla.h
index 149970d441..149970d441 100644
--- a/src/lib/libcrypto/engine/vendor_defns/atalla.h
+++ b/src/lib/libssl/src/engines/vendor_defns/atalla.h
diff --git a/src/lib/libcrypto/engine/vendor_defns/cswift.h b/src/lib/libssl/src/engines/vendor_defns/cswift.h
index 60079326bb..60079326bb 100644
--- a/src/lib/libcrypto/engine/vendor_defns/cswift.h
+++ b/src/lib/libssl/src/engines/vendor_defns/cswift.h
diff --git a/src/lib/libcrypto/engine/vendor_defns/hw_4758_cca.h b/src/lib/libssl/src/engines/vendor_defns/hw_4758_cca.h
index 296636e81a..296636e81a 100644
--- a/src/lib/libcrypto/engine/vendor_defns/hw_4758_cca.h
+++ b/src/lib/libssl/src/engines/vendor_defns/hw_4758_cca.h
diff --git a/src/lib/libcrypto/engine/vendor_defns/hw_ubsec.h b/src/lib/libssl/src/engines/vendor_defns/hw_ubsec.h
index b6619d40f2..b6619d40f2 100644
--- a/src/lib/libcrypto/engine/vendor_defns/hw_ubsec.h
+++ b/src/lib/libssl/src/engines/vendor_defns/hw_ubsec.h
diff --git a/src/lib/libcrypto/engine/vendor_defns/hwcryptohook.h b/src/lib/libssl/src/engines/vendor_defns/hwcryptohook.h
index aaa4d4575e..3c32feda62 100644
--- a/src/lib/libcrypto/engine/vendor_defns/hwcryptohook.h
+++ b/src/lib/libssl/src/engines/vendor_defns/hwcryptohook.h
@@ -65,7 +65,7 @@
  * please contact nCipher.
  *
  *
- * $Id: hwcryptohook.h,v 1.1.1.1 2003/05/11 21:35:16 markus Exp $
+ * $Id: hwcryptohook.h,v 1.1.1.1 2008/09/06 12:15:50 djm Exp $
  */
 
 #ifndef HWCRYPTOHOOK_H