import 0.9.7c

14 files changed, 650 insertions, 14 deletions

diff --git a/src/lib/libcrypto/des/destest.c b/src/lib/libcrypto/des/destest.c
index 687c00c792..3983ac8e5f 100644
--- a/src/lib/libcrypto/des/destest.c
+++ b/src/lib/libcrypto/des/destest.c
@@ -431,7 +431,7 @@ int main(int argc, char *argv[])
 
 #ifndef LIBDES_LIT
         printf("Doing ede ecb\n");
-        for (i=0; i<(NUM_TESTS-1); i++)
+        for (i=0; i<(NUM_TESTS-2); i++)
                 {
                 DES_set_key_unchecked(&key_data[i],&ks);
                 DES_set_key_unchecked(&key_data[i+1],&ks2);
diff --git a/src/lib/libcrypto/engine/hw_ubsec.c b/src/lib/libcrypto/engine/hw_ubsec.c
index 6286dd851c..5234a08a07 100644
--- a/src/lib/libcrypto/engine/hw_ubsec.c
+++ b/src/lib/libcrypto/engine/hw_ubsec.c
@@ -561,7 +561,6 @@ static int ubsec_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_BN_EXPAND_FAIL);
                 return 0;
         }
-        memset(r->d, 0, BN_num_bytes(m));
 
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
                 fd = 0;
diff --git a/src/lib/libcrypto/idea/ideatest.c b/src/lib/libcrypto/idea/ideatest.c
new file mode 100644
index 0000000000..98f805d72a
--- /dev/null
+++ b/src/lib/libcrypto/idea/ideatest.c
@@ -0,0 +1,232 @@
+/* crypto/idea/ideatest.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 <stdlib.h>
+
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_IDEA
+int main(int argc, char *argv[])
+{
+    printf("No IDEA support\n");
+    return(0);
+}
+#else
+#include <openssl/idea.h>
+
+unsigned char k[16]={
+        0x00,0x01,0x00,0x02,0x00,0x03,0x00,0x04,
+        0x00,0x05,0x00,0x06,0x00,0x07,0x00,0x08};
+
+unsigned char in[8]={0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x03};
+unsigned char  c[8]={0x11,0xFB,0xED,0x2B,0x01,0x98,0x6D,0xE5};
+unsigned char out[80];
+
+char *text="Hello to all people out there";
+
+static unsigned char cfb_key[16]={
+        0xe1,0xf0,0xc3,0xd2,0xa5,0xb4,0x87,0x96,
+        0x69,0x78,0x4b,0x5a,0x2d,0x3c,0x0f,0x1e,
+        };
+static unsigned char cfb_iv[80]={0x34,0x12,0x78,0x56,0xab,0x90,0xef,0xcd};
+static unsigned char cfb_buf1[40],cfb_buf2[40],cfb_tmp[8];
+#define CFB_TEST_SIZE 24
+static unsigned char plain[CFB_TEST_SIZE]=
+        {
+        0x4e,0x6f,0x77,0x20,0x69,0x73,
+        0x20,0x74,0x68,0x65,0x20,0x74,
+        0x69,0x6d,0x65,0x20,0x66,0x6f,
+        0x72,0x20,0x61,0x6c,0x6c,0x20
+        };
+static unsigned char cfb_cipher64[CFB_TEST_SIZE]={
+        0x59,0xD8,0xE2,0x65,0x00,0x58,0x6C,0x3F,
+        0x2C,0x17,0x25,0xD0,0x1A,0x38,0xB7,0x2A,
+        0x39,0x61,0x37,0xDC,0x79,0xFB,0x9F,0x45
+
+/*      0xF9,0x78,0x32,0xB5,0x42,0x1A,0x6B,0x38,
+        0x9A,0x44,0xD6,0x04,0x19,0x43,0xC4,0xD9,
+        0x3D,0x1E,0xAE,0x47,0xFC,0xCF,0x29,0x0B,*/
+        }; 
+
+static int cfb64_test(unsigned char *cfb_cipher);
+static char *pt(unsigned char *p);
+int main(int argc, char *argv[])
+        {
+        int i,err=0;
+        IDEA_KEY_SCHEDULE key,dkey; 
+        unsigned char iv[8];
+
+        idea_set_encrypt_key(k,&key);
+        idea_ecb_encrypt(in,out,&key);
+        if (memcmp(out,c,8) != 0)
+                {
+                printf("ecb idea error encrypting\n");
+                printf("got     :");
+                for (i=0; i<8; i++)
+                        printf("%02X ",out[i]);
+                printf("\n");
+                printf("expected:");
+                for (i=0; i<8; i++)
+                        printf("%02X ",c[i]);
+                err=20;
+                printf("\n");
+                }
+
+        idea_set_decrypt_key(&key,&dkey);
+        idea_ecb_encrypt(c,out,&dkey);
+        if (memcmp(out,in,8) != 0)
+                {
+                printf("ecb idea error decrypting\n");
+                printf("got     :");
+                for (i=0; i<8; i++)
+                        printf("%02X ",out[i]);
+                printf("\n");
+                printf("expected:");
+                for (i=0; i<8; i++)
+                        printf("%02X ",in[i]);
+                printf("\n");
+                err=3;
+                }
+
+        if (err == 0) printf("ecb idea ok\n");
+
+        memcpy(iv,k,8);
+        idea_cbc_encrypt((unsigned char *)text,out,strlen(text)+1,&key,iv,1);
+        memcpy(iv,k,8);
+        idea_cbc_encrypt(out,out,8,&dkey,iv,0);
+        idea_cbc_encrypt(&(out[8]),&(out[8]),strlen(text)+1-8,&dkey,iv,0);
+        if (memcmp(text,out,strlen(text)+1) != 0)
+                {
+                printf("cbc idea bad\n");
+                err=4;
+                }
+        else
+                printf("cbc idea ok\n");
+
+        printf("cfb64 idea ");
+        if (cfb64_test(cfb_cipher64))
+                {
+                printf("bad\n");
+                err=5;
+                }
+        else
+                printf("ok\n");
+
+        EXIT(err);
+        return(err);
+        }
+
+static int cfb64_test(unsigned char *cfb_cipher)
+        {
+        IDEA_KEY_SCHEDULE eks,dks;
+        int err=0,i,n;
+
+        idea_set_encrypt_key(cfb_key,&eks);
+        idea_set_decrypt_key(&eks,&dks);
+        memcpy(cfb_tmp,cfb_iv,8);
+        n=0;
+        idea_cfb64_encrypt(plain,cfb_buf1,(long)12,&eks,
+                cfb_tmp,&n,IDEA_ENCRYPT);
+        idea_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
+                (long)CFB_TEST_SIZE-12,&eks,
+                cfb_tmp,&n,IDEA_ENCRYPT);
+        if (memcmp(cfb_cipher,cfb_buf1,CFB_TEST_SIZE) != 0)
+                {
+                err=1;
+                printf("idea_cfb64_encrypt encrypt error\n");
+                for (i=0; i<CFB_TEST_SIZE; i+=8)
+                        printf("%s\n",pt(&(cfb_buf1[i])));
+                }
+        memcpy(cfb_tmp,cfb_iv,8);
+        n=0;
+        idea_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,&eks,
+                cfb_tmp,&n,IDEA_DECRYPT);
+        idea_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
+                (long)CFB_TEST_SIZE-17,&dks,
+                cfb_tmp,&n,IDEA_DECRYPT);
+        if (memcmp(plain,cfb_buf2,CFB_TEST_SIZE) != 0)
+                {
+                err=1;
+                printf("idea_cfb_encrypt decrypt error\n");
+                for (i=0; i<24; i+=8)
+                        printf("%s\n",pt(&(cfb_buf2[i])));
+                }
+        return(err);
+        }
+
+static char *pt(unsigned char *p)
+        {
+        static char bufs[10][20];
+        static int bnum=0;
+        char *ret;
+        int i;
+        static char *f="0123456789ABCDEF";
+
+        ret= &(bufs[bnum++][0]);
+        bnum%=10;
+        for (i=0; i<8; i++)
+                {
+                ret[i*2]=f[(p[i]>>4)&0xf];
+                ret[i*2+1]=f[p[i]&0xf];
+                }
+        ret[16]='\0';
+        return(ret);
+        }
+#endif
diff --git a/src/lib/libcrypto/md2/md2test.c b/src/lib/libcrypto/md2/md2test.c
index 901d0a7d8e..9c1e28b6ce 100644
--- a/src/lib/libcrypto/md2/md2test.c
+++ b/src/lib/libcrypto/md2/md2test.c
@@ -59,7 +59,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <openssl/md2.h>
 
 #include "../e_os.h"
 
@@ -71,6 +70,7 @@ int main(int argc, char *argv[])
 }
 #else
 #include <openssl/evp.h>
+#include <openssl/md2.h>
 
 #ifdef CHARSET_EBCDIC
 #include <openssl/ebcdic.h>
diff --git a/src/lib/libcrypto/md5/asm/md5-sparcv9.S b/src/lib/libcrypto/md5/asm/md5-sparcv9.S
index a599ed5660..db45aa4c97 100644
--- a/src/lib/libcrypto/md5/asm/md5-sparcv9.S
+++ b/src/lib/libcrypto/md5/asm/md5-sparcv9.S
@@ -34,10 +34,12 @@
  *
  * or if above fails (it does if you have gas):
  *
- *      gcc -E -DULTRASPARC -DMD5_BLOCK_DATA_ORDER md5_block.sparc.S | \
+ *      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
diff --git a/src/lib/libcrypto/perlasm/x86ms.pl b/src/lib/libcrypto/perlasm/x86ms.pl
index 35f1a4ddb9..fbb4afb9bd 100644
--- a/src/lib/libcrypto/perlasm/x86ms.pl
+++ b/src/lib/libcrypto/perlasm/x86ms.pl
@@ -144,7 +144,10 @@ 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",@_); }
diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl
index f30b7466d4..30346af4ea 100644
--- a/src/lib/libcrypto/perlasm/x86nasm.pl
+++ b/src/lib/libcrypto/perlasm/x86nasm.pl
@@ -152,7 +152,10 @@ sub main'jle	{ &out1("jle NEAR",@_); }
 sub main'jz     { &out1("jz NEAR",@_); }
 sub main'jge    { &out1("jge NEAR",@_); }
 sub main'jl     { &out1("jl NEAR",@_); }
+sub main'ja     { &out1("ja NEAR",@_); }
+sub main'jae    { &out1("jae NEAR",@_); }
 sub main'jb     { &out1("jb NEAR",@_); }
+sub main'jbe    { &out1("jbe NEAR",@_); }
 sub main'jc     { &out1("jc NEAR",@_); }
 sub main'jnc    { &out1("jnc NEAR",@_); }
 sub main'jnz    { &out1("jnz NEAR",@_); }
diff --git a/src/lib/libcrypto/perlasm/x86unix.pl b/src/lib/libcrypto/perlasm/x86unix.pl
index 72bde061c5..10b669bf04 100644
--- a/src/lib/libcrypto/perlasm/x86unix.pl
+++ b/src/lib/libcrypto/perlasm/x86unix.pl
@@ -156,7 +156,10 @@ 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",@_); }
diff --git a/src/lib/libcrypto/rand/rand_win.c b/src/lib/libcrypto/rand/rand_win.c
index 113b58678f..263068d256 100644
--- a/src/lib/libcrypto/rand/rand_win.c
+++ b/src/lib/libcrypto/rand/rand_win.c
@@ -162,6 +162,7 @@ typedef BOOL (WINAPI *GETCURSORINFO)(PCURSORINFO);
 typedef DWORD (WINAPI *GETQUEUESTATUS)(UINT);
 
 typedef HANDLE (WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);
+typedef BOOL (WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);
 typedef BOOL (WINAPI *HEAP32FIRST)(LPHEAPENTRY32, DWORD, DWORD);
 typedef BOOL (WINAPI *HEAP32NEXT)(LPHEAPENTRY32);
 typedef BOOL (WINAPI *HEAP32LIST)(HANDLE, LPHEAPLIST32);
@@ -431,7 +432,7 @@ int RAND_poll(void)
          * This seeding method was proposed in Peter Gutmann, Software
          * Generation of Practically Strong Random Numbers,
          * http://www.usenix.org/publications/library/proceedings/sec98/gutmann.html
-     * revised version at http://www.cryptoengines.com/~peter/06_random.pdf
+         * revised version at http://www.cryptoengines.com/~peter/06_random.pdf
          * (The assignment of entropy estimates below is arbitrary, but based
          * on Peter's analysis the full poll appears to be safe. Additional
          * interactive seeding is encouraged.)
@@ -440,6 +441,7 @@ int RAND_poll(void)
         if (kernel)
                 {
                 CREATETOOLHELP32SNAPSHOT snap;
+                CLOSETOOLHELP32SNAPSHOT close_snap;
                 HANDLE handle;
 
                 HEAP32FIRST heap_first;
@@ -457,6 +459,8 @@ int RAND_poll(void)
 
                 snap = (CREATETOOLHELP32SNAPSHOT)
                         GetProcAddress(kernel, TEXT("CreateToolhelp32Snapshot"));
+                close_snap = (CLOSETOOLHELP32SNAPSHOT)
+                        GetProcAddress(kernel, TEXT("CloseToolhelp32Snapshot"));
                 heap_first = (HEAP32FIRST) GetProcAddress(kernel, TEXT("Heap32First"));
                 heap_next = (HEAP32NEXT) GetProcAddress(kernel, TEXT("Heap32Next"));
                 heaplist_first = (HEAP32LIST) GetProcAddress(kernel, TEXT("Heap32ListFirst"));
@@ -472,7 +476,7 @@ int RAND_poll(void)
                         heaplist_next && process_first && process_next &&
                         thread_first && thread_next && module_first &&
                         module_next && (handle = snap(TH32CS_SNAPALL,0))
-                        != NULL)
+                        != INVALID_HANDLE_VALUE)
                         {
                         /* heap list and heap walking */
                         /* HEAPLIST32 contains 3 fields that will change with
@@ -534,8 +538,10 @@ int RAND_poll(void)
                                 do
                                         RAND_add(&m, m.dwSize, 9);
                                 while (module_next(handle, &m));
-
-                        CloseHandle(handle);
+                        if (close_snap)
+                                close_snap(handle);
+                        else
+                                CloseHandle(handle);
                         }
 
                 FreeLibrary(kernel);
diff --git a/src/lib/libcrypto/rc5/rc5test.c b/src/lib/libcrypto/rc5/rc5test.c
new file mode 100644
index 0000000000..ce3d0cc16f
--- /dev/null
+++ b/src/lib/libcrypto/rc5/rc5test.c
@@ -0,0 +1,386 @@
+/* crypto/rc5/rc5test.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.]
+ */
+
+/* This has been a quickly hacked 'ideatest.c'.  When I add tests for other
+ * RC5 modes, more of the code will be uncommented. */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_RC5
+int main(int argc, char *argv[])
+{
+    printf("No RC5 support\n");
+    return(0);
+}
+#else
+#include <openssl/rc5.h>
+
+static unsigned char RC5key[5][16]={
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x91,0x5f,0x46,0x19,0xbe,0x41,0xb2,0x51,
+         0x63,0x55,0xa5,0x01,0x10,0xa9,0xce,0x91},
+        {0x78,0x33,0x48,0xe7,0x5a,0xeb,0x0f,0x2f,
+         0xd7,0xb1,0x69,0xbb,0x8d,0xc1,0x67,0x87},
+        {0xdc,0x49,0xdb,0x13,0x75,0xa5,0x58,0x4f,
+         0x64,0x85,0xb4,0x13,0xb5,0xf1,0x2b,0xaf},
+        {0x52,0x69,0xf1,0x49,0xd4,0x1b,0xa0,0x15,
+         0x24,0x97,0x57,0x4d,0x7f,0x15,0x31,0x25},
+        };
+
+static unsigned char RC5plain[5][8]={
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x21,0xA5,0xDB,0xEE,0x15,0x4B,0x8F,0x6D},
+        {0xF7,0xC0,0x13,0xAC,0x5B,0x2B,0x89,0x52},
+        {0x2F,0x42,0xB3,0xB7,0x03,0x69,0xFC,0x92},
+        {0x65,0xC1,0x78,0xB2,0x84,0xD1,0x97,0xCC},
+        };
+
+static unsigned char RC5cipher[5][8]={
+        {0x21,0xA5,0xDB,0xEE,0x15,0x4B,0x8F,0x6D},
+        {0xF7,0xC0,0x13,0xAC,0x5B,0x2B,0x89,0x52},
+        {0x2F,0x42,0xB3,0xB7,0x03,0x69,0xFC,0x92},
+        {0x65,0xC1,0x78,0xB2,0x84,0xD1,0x97,0xCC},
+        {0xEB,0x44,0xE4,0x15,0xDA,0x31,0x98,0x24},
+        };
+
+#define RC5_CBC_NUM 27
+static unsigned char rc5_cbc_cipher[RC5_CBC_NUM][8]={
+        {0x7a,0x7b,0xba,0x4d,0x79,0x11,0x1d,0x1e},
+        {0x79,0x7b,0xba,0x4d,0x78,0x11,0x1d,0x1e},
+        {0x7a,0x7b,0xba,0x4d,0x79,0x11,0x1d,0x1f},
+        {0x7a,0x7b,0xba,0x4d,0x79,0x11,0x1d,0x1f},
+        {0x8b,0x9d,0xed,0x91,0xce,0x77,0x94,0xa6},
+        {0x2f,0x75,0x9f,0xe7,0xad,0x86,0xa3,0x78},
+        {0xdc,0xa2,0x69,0x4b,0xf4,0x0e,0x07,0x88},
+        {0xdc,0xa2,0x69,0x4b,0xf4,0x0e,0x07,0x88},
+        {0xdc,0xfe,0x09,0x85,0x77,0xec,0xa5,0xff},
+        {0x96,0x46,0xfb,0x77,0x63,0x8f,0x9c,0xa8},
+        {0xb2,0xb3,0x20,0x9d,0xb6,0x59,0x4d,0xa4},
+        {0x54,0x5f,0x7f,0x32,0xa5,0xfc,0x38,0x36},
+        {0x82,0x85,0xe7,0xc1,0xb5,0xbc,0x74,0x02},
+        {0xfc,0x58,0x6f,0x92,0xf7,0x08,0x09,0x34},
+        {0xcf,0x27,0x0e,0xf9,0x71,0x7f,0xf7,0xc4},
+        {0xe4,0x93,0xf1,0xc1,0xbb,0x4d,0x6e,0x8c},
+        {0x5c,0x4c,0x04,0x1e,0x0f,0x21,0x7a,0xc3},
+        {0x92,0x1f,0x12,0x48,0x53,0x73,0xb4,0xf7},
+        {0x5b,0xa0,0xca,0x6b,0xbe,0x7f,0x5f,0xad},
+        {0xc5,0x33,0x77,0x1c,0xd0,0x11,0x0e,0x63},
+        {0x29,0x4d,0xdb,0x46,0xb3,0x27,0x8d,0x60},
+        {0xda,0xd6,0xbd,0xa9,0xdf,0xe8,0xf7,0xe8},
+        {0x97,0xe0,0x78,0x78,0x37,0xed,0x31,0x7f},
+        {0x78,0x75,0xdb,0xf6,0x73,0x8c,0x64,0x78},
+        {0x8f,0x34,0xc3,0xc6,0x81,0xc9,0x96,0x95},
+        {0x7c,0xb3,0xf1,0xdf,0x34,0xf9,0x48,0x11},
+        {0x7f,0xd1,0xa0,0x23,0xa5,0xbb,0xa2,0x17},
+        };
+
+static unsigned char rc5_cbc_key[RC5_CBC_NUM][17]={
+        { 1,0x00},
+        { 1,0x00},
+        { 1,0x00},
+        { 1,0x00},
+        { 1,0x00},
+        { 1,0x11},
+        { 1,0x00},
+        { 4,0x00,0x00,0x00,0x00},
+        { 1,0x00},
+        { 1,0x00},
+        { 1,0x00},
+        { 1,0x00},
+        { 4,0x01,0x02,0x03,0x04},
+        { 4,0x01,0x02,0x03,0x04},
+        { 4,0x01,0x02,0x03,0x04},
+        { 8,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        { 8,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        { 8,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        { 8,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {16,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,
+            0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {16,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,
+            0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {16,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,
+            0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        { 5,0x01,0x02,0x03,0x04,0x05},
+        { 5,0x01,0x02,0x03,0x04,0x05},
+        { 5,0x01,0x02,0x03,0x04,0x05},
+        { 5,0x01,0x02,0x03,0x04,0x05},
+        { 5,0x01,0x02,0x03,0x04,0x05},
+        };
+
+static unsigned char rc5_cbc_plain[RC5_CBC_NUM][8]={
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},
+        {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},
+        {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},
+        {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0x10,0x20,0x30,0x40,0x50,0x60,0x70,0x80},
+        {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},
+        {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff},
+        {0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x01},
+        };
+
+static int rc5_cbc_rounds[RC5_CBC_NUM]={
+         0, 0, 0, 0, 0, 1, 2, 2,
+         8, 8,12,16, 8,12,16,12,
+         8,12,16, 8,12,16,12, 8,
+         8, 8, 8,
+        };
+
+static unsigned char rc5_cbc_iv[RC5_CBC_NUM][8]={
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x78,0x75,0xdb,0xf6,0x73,0x8c,0x64,0x78},
+        {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+        {0x7c,0xb3,0xf1,0xdf,0x34,0xf9,0x48,0x11},
+        };
+
+int main(int argc, char *argv[])
+        {
+        int i,n,err=0;
+        RC5_32_KEY key; 
+        unsigned char buf[8],buf2[8],ivb[8];
+
+        for (n=0; n<5; n++)
+                {
+                RC5_32_set_key(&key,16,&(RC5key[n][0]),12);
+
+                RC5_32_ecb_encrypt(&(RC5plain[n][0]),buf,&key,RC5_ENCRYPT);
+                if (memcmp(&(RC5cipher[n][0]),buf,8) != 0)
+                        {
+                        printf("ecb RC5 error encrypting (%d)\n",n+1);
+                        printf("got     :");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",buf[i]);
+                        printf("\n");
+                        printf("expected:");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",RC5cipher[n][i]);
+                        err=20;
+                        printf("\n");
+                        }
+
+                RC5_32_ecb_encrypt(buf,buf2,&key,RC5_DECRYPT);
+                if (memcmp(&(RC5plain[n][0]),buf2,8) != 0)
+                        {
+                        printf("ecb RC5 error decrypting (%d)\n",n+1);
+                        printf("got     :");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",buf2[i]);
+                        printf("\n");
+                        printf("expected:");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",RC5plain[n][i]);
+                        printf("\n");
+                        err=3;
+                        }
+                }
+        if (err == 0) printf("ecb RC5 ok\n");
+
+        for (n=0; n<RC5_CBC_NUM; n++)
+                {
+                i=rc5_cbc_rounds[n];
+                if (i < 8) continue;
+
+                RC5_32_set_key(&key,rc5_cbc_key[n][0],&(rc5_cbc_key[n][1]),i);
+
+                memcpy(ivb,&(rc5_cbc_iv[n][0]),8);
+                RC5_32_cbc_encrypt(&(rc5_cbc_plain[n][0]),buf,8,
+                        &key,&(ivb[0]),RC5_ENCRYPT);
+
+                if (memcmp(&(rc5_cbc_cipher[n][0]),buf,8) != 0)
+                        {
+                        printf("cbc RC5 error encrypting (%d)\n",n+1);
+                        printf("got     :");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",buf[i]);
+                        printf("\n");
+                        printf("expected:");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",rc5_cbc_cipher[n][i]);
+                        err=30;
+                        printf("\n");
+                        }
+
+                memcpy(ivb,&(rc5_cbc_iv[n][0]),8);
+                RC5_32_cbc_encrypt(buf,buf2,8,
+                        &key,&(ivb[0]),RC5_DECRYPT);
+                if (memcmp(&(rc5_cbc_plain[n][0]),buf2,8) != 0)
+                        {
+                        printf("cbc RC5 error decrypting (%d)\n",n+1);
+                        printf("got     :");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",buf2[i]);
+                        printf("\n");
+                        printf("expected:");
+                        for (i=0; i<8; i++)
+                                printf("%02X ",rc5_cbc_plain[n][i]);
+                        printf("\n");
+                        err=3;
+                        }
+                }
+        if (err == 0) printf("cbc RC5 ok\n");
+
+        EXIT(err);
+        return(err);
+        }
+
+#ifdef undef
+static int cfb64_test(unsigned char *cfb_cipher)
+        {
+        IDEA_KEY_SCHEDULE eks,dks;
+        int err=0,i,n;
+
+        idea_set_encrypt_key(cfb_key,&eks);
+        idea_set_decrypt_key(&eks,&dks);
+        memcpy(cfb_tmp,cfb_iv,8);
+        n=0;
+        idea_cfb64_encrypt(plain,cfb_buf1,(long)12,&eks,
+                cfb_tmp,&n,IDEA_ENCRYPT);
+        idea_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
+                (long)CFB_TEST_SIZE-12,&eks,
+                cfb_tmp,&n,IDEA_ENCRYPT);
+        if (memcmp(cfb_cipher,cfb_buf1,CFB_TEST_SIZE) != 0)
+                {
+                err=1;
+                printf("idea_cfb64_encrypt encrypt error\n");
+                for (i=0; i<CFB_TEST_SIZE; i+=8)
+                        printf("%s\n",pt(&(cfb_buf1[i])));
+                }
+        memcpy(cfb_tmp,cfb_iv,8);
+        n=0;
+        idea_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,&eks,
+                cfb_tmp,&n,IDEA_DECRYPT);
+        idea_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
+                (long)CFB_TEST_SIZE-17,&dks,
+                cfb_tmp,&n,IDEA_DECRYPT);
+        if (memcmp(plain,cfb_buf2,CFB_TEST_SIZE) != 0)
+                {
+                err=1;
+                printf("idea_cfb_encrypt decrypt error\n");
+                for (i=0; i<24; i+=8)
+                        printf("%s\n",pt(&(cfb_buf2[i])));
+                }
+        return(err);
+        }
+
+static char *pt(unsigned char *p)
+        {
+        static char bufs[10][20];
+        static int bnum=0;
+        char *ret;
+        int i;
+        static char *f="0123456789ABCDEF";
+
+        ret= &(bufs[bnum++][0]);
+        bnum%=10;
+        for (i=0; i<8; i++)
+                {
+                ret[i*2]=f[(p[i]>>4)&0xf];
+                ret[i*2+1]=f[p[i]&0xf];
+                }
+        ret[16]='\0';
+        return(ret);
+        }
+        
+#endif
+#endif
diff --git a/src/lib/libcrypto/util/extract-names.pl b/src/lib/libcrypto/util/extract-names.pl
index d413a045cc..9f2ad5ef16 100644
--- a/src/lib/libcrypto/util/extract-names.pl
+++ b/src/lib/libcrypto/util/extract-names.pl
@@ -9,8 +9,8 @@ while(<STDIN>) {
     } elsif ($name) {
         if (/ - /) {
             s/ - .*//;
-            s/[ \t,]+/ /g;
-            push @words, split ' ';
+            s/,[ \t]+/,/g;
+            push @words, split ',';
         }
     }
     if (/^=head1 *NAME *$/) {
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index f5c8c0be8a..203c7713e7 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -2801,3 +2801,5 @@ BIO_indent                              3242	EXIST::FUNCTION:
 BUF_strlcpy                             3243    EXIST::FUNCTION:
 OpenSSLDie                              3244    EXIST::FUNCTION:
 OPENSSL_cleanse                         3245    EXIST::FUNCTION:
+ENGINE_setup_bsd_cryptodev              3246    EXIST:__FreeBSD__:FUNCTION:ENGINE
+ERR_release_err_state_table             3247    EXIST::FUNCTION:LHASH
diff --git a/src/lib/libcrypto/util/pl/Mingw32.pl b/src/lib/libcrypto/util/pl/Mingw32.pl
index 043a3a53ee..4bee638c4a 100644
--- a/src/lib/libcrypto/util/pl/Mingw32.pl
+++ b/src/lib/libcrypto/util/pl/Mingw32.pl
@@ -85,7 +85,7 @@ sub do_lib_rule
         ($Name=$name) =~ tr/a-z/A-Z/;
 
         $ret.="$target: \$(${Name}OBJ)\n";
-        $ret.="\t\$(RM) $target\n";
+        $ret.="\tif exist $target \$(RM) $target\n";
         $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n";
         $ret.="\t\$(RANLIB) $target\n\n";
         }
diff --git a/src/lib/libcrypto/util/point.sh b/src/lib/libcrypto/util/point.sh
index ce7dcc56df..4790e08f8a 100644
--- a/src/lib/libcrypto/util/point.sh
+++ b/src/lib/libcrypto/util/point.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-rm -f $2
+rm -f "$2"
 if test "$OSTYPE" = msdosdjgpp; then
-    cp $1 $2
+    cp "$1" "$2"
 else
-    ln -s $1 $2
+    ln -s "$1" "$2"
 fi
 echo "$2 => $1"