RT3549: Remove obsolete files in crypto

Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/crypto/bf/asm/bf-686.pl b/crypto/bf/asm/bf-686.pl
deleted file mode 100644 (file)
index 8e4c25f..0000000
--- a/crypto/bf/asm/bf-686.pl
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/local/bin/perl
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-require "cbc.pl";
-
-&asm_init($ARGV[0],"bf-686.pl");
-
-$BF_ROUNDS=16;
-$BF_OFF=($BF_ROUNDS+2)*4;
-$L="ecx";
-$R="edx";
-$P="edi";
-$tot="esi";
-$tmp1="eax";
-$tmp2="ebx";
-$tmp3="ebp";
-
-&des_encrypt("BF_encrypt",1);
-&des_encrypt("BF_decrypt",0);
-&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1);
-
-&asm_finish();
-
-&file_end();
-
-sub des_encrypt
-       {
-       local($name,$enc)=@_;
-
-       &function_begin($name,"");
-
-       &comment("");
-       &comment("Load the 2 words");
-       &mov("eax",&wparam(0));
-       &mov($L,&DWP(0,"eax","",0));
-       &mov($R,&DWP(4,"eax","",0));
-
-       &comment("");
-       &comment("P pointer, s and enc flag");
-       &mov($P,&wparam(1));
-
-       &xor(   $tmp1,  $tmp1);
-       &xor(   $tmp2,  $tmp2);
-
-       # encrypting part
-
-       if ($enc)
-               {
-               &xor($L,&DWP(0,$P,"",0));
-               for ($i=0; $i<$BF_ROUNDS; $i+=2)
-                       {
-                       &comment("");
-                       &comment("Round $i");
-                       &BF_ENCRYPT($i+1,$R,$L,$P,$tot,$tmp1,$tmp2,$tmp3);
-
-                       &comment("");
-                       &comment("Round ".sprintf("%d",$i+1));
-                       &BF_ENCRYPT($i+2,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3);
-                       }
-               &xor($R,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
-
-               &mov("eax",&wparam(0));
-               &mov(&DWP(0,"eax","",0),$R);
-               &mov(&DWP(4,"eax","",0),$L);
-               &function_end_A($name);
-               }
-       else
-               {
-               &xor($L,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
-               for ($i=$BF_ROUNDS; $i>0; $i-=2)
-                       {
-                       &comment("");
-                       &comment("Round $i");
-                       &BF_ENCRYPT($i,$R,$L,$P,$tot,$tmp1,$tmp2,$tmp3);
-                       &comment("");
-                       &comment("Round ".sprintf("%d",$i-1));
-                       &BF_ENCRYPT($i-1,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3);
-                       }
-               &xor($R,&DWP(0,$P,"",0));
-
-               &mov("eax",&wparam(0));
-               &mov(&DWP(0,"eax","",0),$R);
-               &mov(&DWP(4,"eax","",0),$L);
-               &function_end_A($name);
-               }
-
-       &function_end_B($name);
-       }
-
-sub BF_ENCRYPT
-       {
-       local($i,$L,$R,$P,$tot,$tmp1,$tmp2,$tmp3)=@_;
-
-       &rotr(  $R,             16);
-       &mov(   $tot,           &DWP(&n2a($i*4),$P,"",0));
-
-       &movb(  &LB($tmp1),     &HB($R));
-       &movb(  &LB($tmp2),     &LB($R));
-
-       &rotr(  $R,             16);
-       &xor(   $L,             $tot);
-
-       &mov(   $tot,           &DWP(&n2a($BF_OFF+0x0000),$P,$tmp1,4));
-       &mov(   $tmp3,          &DWP(&n2a($BF_OFF+0x0400),$P,$tmp2,4));
-
-       &movb(  &LB($tmp1),     &HB($R));
-       &movb(  &LB($tmp2),     &LB($R));
-
-       &add(   $tot,           $tmp3);
-       &mov(   $tmp1,          &DWP(&n2a($BF_OFF+0x0800),$P,$tmp1,4)); # delay
-
-       &xor(   $tot,           $tmp1);
-       &mov(   $tmp3,          &DWP(&n2a($BF_OFF+0x0C00),$P,$tmp2,4));
-
-       &add(   $tot,           $tmp3);
-       &xor(   $tmp1,          $tmp1);
-
-       &xor(   $L,             $tot);                                  
-       # delay
-       }
-
-sub n2a
-       {
-       sprintf("%d",$_[0]);
-       }
-

diff --git a/crypto/bf/asm/readme b/crypto/bf/asm/readme
deleted file mode 100644 (file)
index 2385fa3..0000000
--- a/crypto/bf/asm/readme
+++ /dev/null
@@ -1,10 +0,0 @@
-There are blowfish assembler generation scripts.
-bf-586.pl version is for the pentium and
-bf-686.pl is my original version, which is faster on the pentium pro.
-
-When using a bf-586.pl, the pentium pro/II is %8 slower than using
-bf-686.pl.  When using a bf-686.pl, the pentium is %16 slower
-than bf-586.pl
-
-So the default is bf-586.pl
-

diff --git a/crypto/bf/bf_opts.c b/crypto/bf/bf_opts.c
deleted file mode 100644 (file)
index 1721bb9..0000000
--- a/crypto/bf/bf_opts.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* crypto/bf/bf_opts.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.]
- */
-
-/* define PART1, PART2, PART3 or PART4 to build only with a few of the options.
- * This is for machines with 64k code segment size restrictions. */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/blowfish.h>
-
-#define BF_DEFAULT_OPTIONS
-
-#undef BF_ENC
-#define BF_encrypt  BF_encrypt_normal
-#undef HEADER_BF_LOCL_H
-#include "bf_enc.c"
-
-#define BF_PTR
-#undef BF_PTR2
-#undef BF_ENC
-#undef BF_encrypt
-#define BF_encrypt  BF_encrypt_ptr
-#undef HEADER_BF_LOCL_H
-#include "bf_enc.c"
-
-#undef BF_PTR
-#define BF_PTR2
-#undef BF_ENC
-#undef BF_encrypt
-#define BF_encrypt  BF_encrypt_ptr2
-#undef HEADER_BF_LOCL_H
-#include "bf_enc.c"
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# ifndef CLK_TCK
-#  ifndef _BSD_CLK_TCK_ /* FreeBSD fix */
-#   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
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-#ifdef SIGALRM
-#define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10);
-#else
-#define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb);
-#endif
-       
-#define time_it(func,name,index) \
-       print_name(name); \
-       Time_F(START); \
-       for (count=0,run=1; COND(cb); count+=4) \
-               { \
-               unsigned long d[2]; \
-               func(d,&sch); \
-               func(d,&sch); \
-               func(d,&sch); \
-               func(d,&sch); \
-               } \
-       tm[index]=Time_F(STOP); \
-       fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \
-       tm[index]=((double)COUNT(cb))/tm[index];
-
-#define print_it(name,index) \
-       fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \
-               tm[index]*8,1.0e6/tm[index]);
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static char key[16]={   0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                               0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
-       BF_KEY sch;
-       double d,tm[16],max=0;
-       int rank[16];
-       char *str[16];
-       int max_idx=0,i,num=0,j;
-#ifndef SIGALARM
-       long ca,cb,cc,cd,ce;
-#endif
-
-       for (i=0; i<12; i++)
-               {
-               tm[i]=0.0;
-               rank[i]=0;
-               }
-
-#ifndef TIMES
-       fprintf(stderr,"To get the most accurate results, try to run this\n");
-       fprintf(stderr,"program when this computer is idle.\n");
-#endif
-
-       BF_set_key(&sch,16,key);
-
-#ifndef SIGALRM
-       fprintf(stderr,"First we calculate the approximate speed ...\n");
-       count=10;
-       do      {
-               long i;
-               unsigned long data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       BF_encrypt(data,&sch);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count;
-       cb=count*3;
-       cc=count*3*8/BUFSIZE+1;
-       cd=count*8/BUFSIZE+1;
-
-       ce=count/20+1;
-#define COND(d) (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c) (run)
-#define COUNT(d) (count)
-        signal(SIGALRM,sig_done);
-        alarm(10);
-#endif
-
-       time_it(BF_encrypt_normal,      "BF_encrypt_normal ", 0);
-       time_it(BF_encrypt_ptr,         "BF_encrypt_ptr    ", 1);
-       time_it(BF_encrypt_ptr2,        "BF_encrypt_ptr2   ", 2);
-       num+=3;
-
-       str[0]="<nothing>";
-       print_it("BF_encrypt_normal ",0);
-       max=tm[0];
-       max_idx=0;
-       str[1]="ptr      ";
-       print_it("BF_encrypt_ptr ",1);
-       if (max < tm[1]) { max=tm[1]; max_idx=1; }
-       str[2]="ptr2     ";
-       print_it("BF_encrypt_ptr2 ",2);
-       if (max < tm[2]) { max=tm[2]; max_idx=2; }
-
-       printf("options    BF ecb/s\n");
-       printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]);
-       d=tm[max_idx];
-       tm[max_idx]= -2.0;
-       max= -1.0;
-       for (;;)
-               {
-               for (i=0; i<3; i++)
-                       {
-                       if (max < tm[i]) { max=tm[i]; j=i; }
-                       }
-               if (max < 0.0) break;
-               printf("%s %12.2f  %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0);
-               tm[j]= -2.0;
-               max= -1.0;
-               }
-
-       switch (max_idx)
-               {
-       case 0:
-               printf("-DBF_DEFAULT_OPTIONS\n");
-               break;
-       case 1:
-               printf("-DBF_PTR\n");
-               break;
-       case 2:
-               printf("-DBF_PTR2\n");
-               break;
-               }
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }

diff --git a/crypto/bf/bfspeed.c b/crypto/bf/bfspeed.c
deleted file mode 100644 (file)
index c41ef3b..0000000
--- a/crypto/bf/bfspeed.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* crypto/bf/bfspeed.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.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/blowfish.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-#ifndef CLK_TCK
-#define HZ     100.0
-#else /* CLK_TCK */
-#define HZ ((double)CLK_TCK)
-#endif
-#endif
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static unsigned char key[] ={
-                       0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                       0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-                       };
-       BF_KEY sch;
-       double a,b,c,d;
-#ifndef SIGALRM
-       long ca,cb,cc;
-#endif
-
-#ifndef TIMES
-       printf("To get the most accurate results, try to run this\n");
-       printf("program when this computer is idle.\n");
-#endif
-
-#ifndef SIGALRM
-       printf("First we calculate the approximate speed ...\n");
-       BF_set_key(&sch,16,key);
-       count=10;
-       do      {
-               long i;
-               BF_LONG data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       BF_encrypt(data,&sch);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count/512;
-       cb=count;
-       cc=count*8/BUFSIZE+1;
-       printf("Doing BF_set_key %ld times\n",ca);
-#define COND(d)        (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)        (run)
-#define COUNT(d) (count)
-       signal(SIGALRM,sig_done);
-       printf("Doing BF_set_key for 10 seconds\n");
-       alarm(10);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(ca); count+=4)
-               {
-               BF_set_key(&sch,16,key);
-               BF_set_key(&sch,16,key);
-               BF_set_key(&sch,16,key);
-               BF_set_key(&sch,16,key);
-               }
-       d=Time_F(STOP);
-       printf("%ld BF_set_key's in %.2f seconds\n",count,d);
-       a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-       printf("Doing BF_encrypt's for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing BF_encrypt %ld times\n",cb);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cb); count+=4)
-               {
-               BF_LONG data[2];
-
-               BF_encrypt(data,&sch);
-               BF_encrypt(data,&sch);
-               BF_encrypt(data,&sch);
-               BF_encrypt(data,&sch);
-               }
-       d=Time_F(STOP);
-       printf("%ld BF_encrypt's in %.2f second\n",count,d);
-       b=((double)COUNT(cb)*8)/d;
-
-#ifdef SIGALRM
-       printf("Doing BF_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-               BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing BF_cbc_encrypt %ld times on %ld byte blocks\n",cc,
-               BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cc); count++)
-               BF_cbc_encrypt(buf,buf,BUFSIZE,&sch,
-                       &(key[0]),BF_ENCRYPT);
-       d=Time_F(STOP);
-       printf("%ld BF_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       c=((double)COUNT(cc)*BUFSIZE)/d;
-
-       printf("Blowfish set_key       per sec = %12.3f (%9.3fuS)\n",a,1.0e6/a);
-       printf("Blowfish raw ecb bytes per sec = %12.3f (%9.3fuS)\n",b,8.0e6/b);
-       printf("Blowfish cbc     bytes per sec = %12.3f (%9.3fuS)\n",c,8.0e6/c);
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }

diff --git a/crypto/bn/asm/README b/crypto/bn/asm/README
deleted file mode 100644 (file)
index 542894d..0000000
--- a/crypto/bn/asm/README
+++ /dev/null
@@ -1,27 +0,0 @@
-<OBSOLETE>
-
-All assember in this directory are just version of the file
-crypto/bn/bn_asm.c.
-
-Quite a few of these files are just the assember output from gcc since on 
-quite a few machines they are 2 times faster than the system compiler.
-
-For the x86, I have hand written assember because of the bad job all
-compilers seem to do on it.  This normally gives a 2 time speed up in the RSA
-routines.
-
-For the DEC alpha, I also hand wrote the assember (except the division which
-is just the output from the C compiler pasted on the end of the file).
-On the 2 alpha C compilers I had access to, it was not possible to do
-64b x 64b -> 128b calculations (both long and the long long data types
-were 64 bits).  So the hand assember gives access to the 128 bit result and
-a 2 times speedup :-).
-
-There are 3 versions of assember for the HP PA-RISC.
-
-pa-risc.s is the original one which works fine and generated using gcc :-)
-
-pa-risc2W.s and pa-risc2.s are 64 and 32-bit PA-RISC 2.0 implementations
-by Chris Ruemmler from HP (with some help from the HP C compiler).
-
-</OBSOLETE>

diff --git a/crypto/bn/asm/x86/add.pl b/crypto/bn/asm/x86/add.pl
deleted file mode 100644 (file)
index 0b5cf58..0000000
--- a/crypto/bn/asm/x86/add.pl
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_add_words
-       {
-       local($name)=@_;
-
-       &function_begin($name,"");
-
-       &comment("");
-       $a="esi";
-       $b="edi";
-       $c="eax";
-       $r="ebx";
-       $tmp1="ecx";
-       $tmp2="edx";
-       $num="ebp";
-
-       &mov($r,&wparam(0));    # get r
-        &mov($a,&wparam(1));   # get a
-       &mov($b,&wparam(2));    # get b
-        &mov($num,&wparam(3)); # get num
-       &xor($c,$c);            # clear carry
-        &and($num,0xfffffff8); # num / 8
-
-       &jz(&label("aw_finish"));
-
-       &set_label("aw_loop",0);
-       for ($i=0; $i<8; $i++)
-               {
-               &comment("Round $i");
-
-               &mov($tmp1,&DWP($i*4,$a,"",0));         # *a
-                &mov($tmp2,&DWP($i*4,$b,"",0));        # *b
-               &add($tmp1,$c);
-                &mov($c,0);
-               &adc($c,$c);
-                &add($tmp1,$tmp2);
-               &adc($c,0);
-                &mov(&DWP($i*4,$r,"",0),$tmp1);        # *r
-               }
-
-       &comment("");
-       &add($a,32);
-        &add($b,32);
-       &add($r,32);
-        &sub($num,8);
-       &jnz(&label("aw_loop"));
-
-       &set_label("aw_finish",0);
-       &mov($num,&wparam(3));  # get num
-       &and($num,7);
-        &jz(&label("aw_end"));
-
-       for ($i=0; $i<7; $i++)
-               {
-               &comment("Tail Round $i");
-               &mov($tmp1,&DWP($i*4,$a,"",0)); # *a
-                &mov($tmp2,&DWP($i*4,$b,"",0));# *b
-               &add($tmp1,$c);
-                &mov($c,0);
-               &adc($c,$c);
-                &add($tmp1,$tmp2);
-               &adc($c,0);
-                &dec($num) if ($i != 6);
-               &mov(&DWP($i*4,$r,"",0),$tmp1); # *a
-                &jz(&label("aw_end")) if ($i != 6);
-               }
-       &set_label("aw_end",0);
-
-#      &mov("eax",$c);         # $c is "eax"
-
-       &function_end($name);
-       }
-
-1;

diff --git a/crypto/bn/asm/x86/comba.pl b/crypto/bn/asm/x86/comba.pl
deleted file mode 100644 (file)
index 2291253..0000000
--- a/crypto/bn/asm/x86/comba.pl
+++ /dev/null
@@ -1,277 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub mul_add_c
-       {
-       local($a,$ai,$b,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-       # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-       # words, and 1 if load return value
-
-       &comment("mul a[$ai]*b[$bi]");
-
-       # "eax" and "edx" will always be pre-loaded.
-       # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-       # &mov("edx",&DWP($bi*4,$b,"",0));
-
-       &mul("edx");
-       &add($c0,"eax");
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # laod next a
-        &mov("eax",&wparam(0)) if $pos > 0;                    # load r[]
-        ###
-       &adc($c1,"edx");
-        &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 0;        # laod next b
-        &mov("edx",&DWP(($nb)*4,$b,"",0)) if $pos == 1;        # laod next b
-        ###
-       &adc($c2,0);
-        # is pos > 1, it means it is the last loop 
-        &mov(&DWP($i*4,"eax","",0),$c0) if $pos > 0;           # save r[];
-       &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;         # laod next a
-       }
-
-sub sqr_add_c
-       {
-       local($r,$a,$ai,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-       # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-       # words, and 1 if load return value
-
-       &comment("sqr a[$ai]*a[$bi]");
-
-       # "eax" and "edx" will always be pre-loaded.
-       # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-       # &mov("edx",&DWP($bi*4,$b,"",0));
-
-       if ($ai == $bi)
-               { &mul("eax");}
-       else
-               { &mul("edx");}
-       &add($c0,"eax");
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # load next a
-        ###
-       &adc($c1,"edx");
-        &mov("edx",&DWP(($nb)*4,$a,"",0)) if ($pos == 1) && ($na != $nb);
-        ###
-       &adc($c2,0);
-        # is pos > 1, it means it is the last loop 
-        &mov(&DWP($i*4,$r,"",0),$c0) if $pos > 0;              # save r[];
-       &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;         # load next b
-       }
-
-sub sqr_add_c2
-       {
-       local($r,$a,$ai,$bi,$c0,$c1,$c2,$pos,$i,$na,$nb)=@_;
-
-       # pos == -1 if eax and edx are pre-loaded, 0 to load from next
-       # words, and 1 if load return value
-
-       &comment("sqr a[$ai]*a[$bi]");
-
-       # "eax" and "edx" will always be pre-loaded.
-       # &mov("eax",&DWP($ai*4,$a,"",0)) ;
-       # &mov("edx",&DWP($bi*4,$a,"",0));
-
-       if ($ai == $bi)
-               { &mul("eax");}
-       else
-               { &mul("edx");}
-       &add("eax","eax");
-        ###
-       &adc("edx","edx");
-        ###
-       &adc($c2,0);
-        &add($c0,"eax");
-       &adc($c1,"edx");
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 0;        # load next a
-        &mov("eax",&DWP(($na)*4,$a,"",0)) if $pos == 1;        # load next b
-       &adc($c2,0);
-       &mov(&DWP($i*4,$r,"",0),$c0) if $pos > 0;               # save r[];
-        &mov("edx",&DWP(($nb)*4,$a,"",0)) if ($pos <= 1) && ($na != $nb);
-        ###
-       }
-
-sub bn_mul_comba
-       {
-       local($name,$num)=@_;
-       local($a,$b,$c0,$c1,$c2);
-       local($i,$as,$ae,$bs,$be,$ai,$bi);
-       local($tot,$end);
-
-       &function_begin_B($name,"");
-
-       $c0="ebx";
-       $c1="ecx";
-       $c2="ebp";
-       $a="esi";
-       $b="edi";
-       
-       $as=0;
-       $ae=0;
-       $bs=0;
-       $be=0;
-       $tot=$num+$num-1;
-
-       &push("esi");
-        &mov($a,&wparam(1));
-       &push("edi");
-        &mov($b,&wparam(2));
-       &push("ebp");
-        &push("ebx");
-
-       &xor($c0,$c0);
-        &mov("eax",&DWP(0,$a,"",0));   # load the first word 
-       &xor($c1,$c1);
-        &mov("edx",&DWP(0,$b,"",0));   # load the first second 
-
-       for ($i=0; $i<$tot; $i++)
-               {
-               $ai=$as;
-               $bi=$bs;
-               $end=$be+1;
-
-               &comment("################## Calculate word $i"); 
-
-               for ($j=$bs; $j<$end; $j++)
-                       {
-                       &xor($c2,$c2) if ($j == $bs);
-                       if (($j+1) == $end)
-                               {
-                               $v=1;
-                               $v=2 if (($i+1) == $tot);
-                               }
-                       else
-                               { $v=0; }
-                       if (($j+1) != $end)
-                               {
-                               $na=($ai-1);
-                               $nb=($bi+1);
-                               }
-                       else
-                               {
-                               $na=$as+($i < ($num-1));
-                               $nb=$bs+($i >= ($num-1));
-                               }
-#printf STDERR "[$ai,$bi] -> [$na,$nb]\n";
-                       &mul_add_c($a,$ai,$b,$bi,$c0,$c1,$c2,$v,$i,$na,$nb);
-                       if ($v)
-                               {
-                               &comment("saved r[$i]");
-                               # &mov("eax",&wparam(0));
-                               # &mov(&DWP($i*4,"eax","",0),$c0);
-                               ($c0,$c1,$c2)=($c1,$c2,$c0);
-                               }
-                       $ai--;
-                       $bi++;
-                       }
-               $as++ if ($i < ($num-1));
-               $ae++ if ($i >= ($num-1));
-
-               $bs++ if ($i >= ($num-1));
-               $be++ if ($i < ($num-1));
-               }
-       &comment("save r[$i]");
-       # &mov("eax",&wparam(0));
-       &mov(&DWP($i*4,"eax","",0),$c0);
-
-       &pop("ebx");
-       &pop("ebp");
-       &pop("edi");
-       &pop("esi");
-       &ret();
-       &function_end_B($name);
-       }
-
-sub bn_sqr_comba
-       {
-       local($name,$num)=@_;
-       local($r,$a,$c0,$c1,$c2)=@_;
-       local($i,$as,$ae,$bs,$be,$ai,$bi);
-       local($b,$tot,$end,$half);
-
-       &function_begin_B($name,"");
-
-       $c0="ebx";
-       $c1="ecx";
-       $c2="ebp";
-       $a="esi";
-       $r="edi";
-
-       &push("esi");
-        &push("edi");
-       &push("ebp");
-        &push("ebx");
-       &mov($r,&wparam(0));
-        &mov($a,&wparam(1));
-       &xor($c0,$c0);
-        &xor($c1,$c1);
-       &mov("eax",&DWP(0,$a,"",0)); # load the first word
-
-       $as=0;
-       $ae=0;
-       $bs=0;
-       $be=0;
-       $tot=$num+$num-1;
-
-       for ($i=0; $i<$tot; $i++)
-               {
-               $ai=$as;
-               $bi=$bs;
-               $end=$be+1;
-
-               &comment("############### Calculate word $i");
-               for ($j=$bs; $j<$end; $j++)
-                       {
-                       &xor($c2,$c2) if ($j == $bs);
-                       if (($ai-1) < ($bi+1))
-                               {
-                               $v=1;
-                               $v=2 if ($i+1) == $tot;
-                               }
-                       else
-                               { $v=0; }
-                       if (!$v)
-                               {
-                               $na=$ai-1;
-                               $nb=$bi+1;
-                               }
-                       else
-                               {
-                               $na=$as+($i < ($num-1));
-                               $nb=$bs+($i >= ($num-1));
-                               }
-                       if ($ai == $bi)
-                               {
-                               &sqr_add_c($r,$a,$ai,$bi,
-                                       $c0,$c1,$c2,$v,$i,$na,$nb);
-                               }
-                       else
-                               {
-                               &sqr_add_c2($r,$a,$ai,$bi,
-                                       $c0,$c1,$c2,$v,$i,$na,$nb);
-                               }
-                       if ($v)
-                               {
-                               &comment("saved r[$i]");
-                               #&mov(&DWP($i*4,$r,"",0),$c0);
-                               ($c0,$c1,$c2)=($c1,$c2,$c0);
-                               last;
-                               }
-                       $ai--;
-                       $bi++;
-                       }
-               $as++ if ($i < ($num-1));
-               $ae++ if ($i >= ($num-1));
-
-               $bs++ if ($i >= ($num-1));
-               $be++ if ($i < ($num-1));
-               }
-       &mov(&DWP($i*4,$r,"",0),$c0);
-       &pop("ebx");
-       &pop("ebp");
-       &pop("edi");
-       &pop("esi");
-       &ret();
-       &function_end_B($name);
-       }
-
-1;

diff --git a/crypto/bn/asm/x86/div.pl b/crypto/bn/asm/x86/div.pl
deleted file mode 100644 (file)
index 0e90152..0000000
--- a/crypto/bn/asm/x86/div.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_div_words
-       {
-       local($name)=@_;
-
-       &function_begin($name,"");
-       &mov("edx",&wparam(0)); #
-       &mov("eax",&wparam(1)); #
-       &mov("ebx",&wparam(2)); #
-       &div("ebx");
-       &function_end($name);
-       }
-1;

diff --git a/crypto/bn/asm/x86/f b/crypto/bn/asm/x86/f
deleted file mode 100644 (file)
index 22e4112..0000000
--- a/crypto/bn/asm/x86/f
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-

diff --git a/crypto/bn/asm/x86/mul.pl b/crypto/bn/asm/x86/mul.pl
deleted file mode 100644 (file)
index 674cb9b..0000000
--- a/crypto/bn/asm/x86/mul.pl
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_mul_words
-       {
-       local($name)=@_;
-
-       &function_begin($name,"");
-
-       &comment("");
-       $Low="eax";
-       $High="edx";
-       $a="ebx";
-       $w="ecx";
-       $r="edi";
-       $c="esi";
-       $num="ebp";
-
-       &xor($c,$c);            # clear carry
-       &mov($r,&wparam(0));    #
-       &mov($a,&wparam(1));    #
-       &mov($num,&wparam(2));  #
-       &mov($w,&wparam(3));    #
-
-       &and($num,0xfffffff8);  # num / 8
-       &jz(&label("mw_finish"));
-
-       &set_label("mw_loop",0);
-       for ($i=0; $i<32; $i+=4)
-               {
-               &comment("Round $i");
-
-                &mov("eax",&DWP($i,$a,"",0));  # *a
-               &mul($w);                       # *a * w
-               &add("eax",$c);                 # L(t)+=c
-                # XXX
-
-               &adc("edx",0);                  # H(t)+=carry
-                &mov(&DWP($i,$r,"",0),"eax");  # *r= L(t);
-
-               &mov($c,"edx");                 # c=  H(t);
-               }
-
-       &comment("");
-       &add($a,32);
-       &add($r,32);
-       &sub($num,8);
-       &jz(&label("mw_finish"));
-       &jmp(&label("mw_loop"));
-
-       &set_label("mw_finish",0);
-       &mov($num,&wparam(2));  # get num
-       &and($num,7);
-       &jnz(&label("mw_finish2"));
-       &jmp(&label("mw_end"));
-
-       &set_label("mw_finish2",1);
-       for ($i=0; $i<7; $i++)
-               {
-               &comment("Tail Round $i");
-                &mov("eax",&DWP($i*4,$a,"",0));# *a
-               &mul($w);                       # *a * w
-               &add("eax",$c);                 # L(t)+=c
-                # XXX
-               &adc("edx",0);                  # H(t)+=carry
-                &mov(&DWP($i*4,$r,"",0),"eax");# *r= L(t);
-               &mov($c,"edx");                 # c=  H(t);
-                &dec($num) if ($i != 7-1);
-               &jz(&label("mw_end")) if ($i != 7-1);
-               }
-       &set_label("mw_end",0);
-       &mov("eax",$c);
-
-       &function_end($name);
-       }
-
-1;

diff --git a/crypto/bn/asm/x86/mul_add.pl b/crypto/bn/asm/x86/mul_add.pl
deleted file mode 100644 (file)
index 61830d3..0000000
--- a/crypto/bn/asm/x86/mul_add.pl
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_mul_add_words
-       {
-       local($name)=@_;
-
-       &function_begin($name,"");
-
-       &comment("");
-       $Low="eax";
-       $High="edx";
-       $a="ebx";
-       $w="ebp";
-       $r="edi";
-       $c="esi";
-
-       &xor($c,$c);            # clear carry
-       &mov($r,&wparam(0));    #
-
-       &mov("ecx",&wparam(2)); #
-       &mov($a,&wparam(1));    #
-
-       &and("ecx",0xfffffff8); # num / 8
-       &mov($w,&wparam(3));    #
-
-       &push("ecx");           # Up the stack for a tmp variable
-
-       &jz(&label("maw_finish"));
-
-       &set_label("maw_loop",0);
-
-       &mov(&swtmp(0),"ecx");  #
-
-       for ($i=0; $i<32; $i+=4)
-               {
-               &comment("Round $i");
-
-                &mov("eax",&DWP($i,$a,"",0));  # *a
-               &mul($w);                       # *a * w
-               &add("eax",$c);         # L(t)+= *r
-                &mov($c,&DWP($i,$r,"",0));     # L(t)+= *r
-               &adc("edx",0);                  # H(t)+=carry
-                &add("eax",$c);                # L(t)+=c
-               &adc("edx",0);                  # H(t)+=carry
-                &mov(&DWP($i,$r,"",0),"eax");  # *r= L(t);
-               &mov($c,"edx");                 # c=  H(t);
-               }
-
-       &comment("");
-       &mov("ecx",&swtmp(0));  #
-       &add($a,32);
-       &add($r,32);
-       &sub("ecx",8);
-       &jnz(&label("maw_loop"));
-
-       &set_label("maw_finish",0);
-       &mov("ecx",&wparam(2)); # get num
-       &and("ecx",7);
-       &jnz(&label("maw_finish2"));    # helps branch prediction
-       &jmp(&label("maw_end"));
-
-       &set_label("maw_finish2",1);
-       for ($i=0; $i<7; $i++)
-               {
-               &comment("Tail Round $i");
-                &mov("eax",&DWP($i*4,$a,"",0));# *a
-               &mul($w);                       # *a * w
-               &add("eax",$c);                 # L(t)+=c
-                &mov($c,&DWP($i*4,$r,"",0));   # L(t)+= *r
-               &adc("edx",0);                  # H(t)+=carry
-                &add("eax",$c);
-               &adc("edx",0);                  # H(t)+=carry
-                &dec("ecx") if ($i != 7-1);
-               &mov(&DWP($i*4,$r,"",0),"eax"); # *r= L(t);
-                &mov($c,"edx");                        # c=  H(t);
-               &jz(&label("maw_end")) if ($i != 7-1);
-               }
-       &set_label("maw_end",0);
-       &mov("eax",$c);
-
-       &pop("ecx");    # clear variable from
-
-       &function_end($name);
-       }
-
-1;

diff --git a/crypto/bn/asm/x86/sqr.pl b/crypto/bn/asm/x86/sqr.pl
deleted file mode 100644 (file)
index 1f90993..0000000
--- a/crypto/bn/asm/x86/sqr.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_sqr_words
-       {
-       local($name)=@_;
-
-       &function_begin($name,"");
-
-       &comment("");
-       $r="esi";
-       $a="edi";
-       $num="ebx";
-
-       &mov($r,&wparam(0));    #
-       &mov($a,&wparam(1));    #
-       &mov($num,&wparam(2));  #
-
-       &and($num,0xfffffff8);  # num / 8
-       &jz(&label("sw_finish"));
-
-       &set_label("sw_loop",0);
-       for ($i=0; $i<32; $i+=4)
-               {
-               &comment("Round $i");
-               &mov("eax",&DWP($i,$a,"",0));   # *a
-                # XXX
-               &mul("eax");                    # *a * *a
-               &mov(&DWP($i*2,$r,"",0),"eax"); #
-                &mov(&DWP($i*2+4,$r,"",0),"edx");#
-               }
-
-       &comment("");
-       &add($a,32);
-       &add($r,64);
-       &sub($num,8);
-       &jnz(&label("sw_loop"));
-
-       &set_label("sw_finish",0);
-       &mov($num,&wparam(2));  # get num
-       &and($num,7);
-       &jz(&label("sw_end"));
-
-       for ($i=0; $i<7; $i++)
-               {
-               &comment("Tail Round $i");
-               &mov("eax",&DWP($i*4,$a,"",0)); # *a
-                # XXX
-               &mul("eax");                    # *a * *a
-               &mov(&DWP($i*8,$r,"",0),"eax"); #
-                &dec($num) if ($i != 7-1);
-               &mov(&DWP($i*8+4,$r,"",0),"edx");
-                &jz(&label("sw_end")) if ($i != 7-1);
-               }
-       &set_label("sw_end",0);
-
-       &function_end($name);
-       }
-
-1;

diff --git a/crypto/bn/asm/x86/sub.pl b/crypto/bn/asm/x86/sub.pl
deleted file mode 100644 (file)
index 837b0e1..0000000
--- a/crypto/bn/asm/x86/sub.pl
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/local/bin/perl
-# x86 assember
-
-sub bn_sub_words
-       {
-       local($name)=@_;
-
-       &function_begin($name,"");
-
-       &comment("");
-       $a="esi";
-       $b="edi";
-       $c="eax";
-       $r="ebx";
-       $tmp1="ecx";
-       $tmp2="edx";
-       $num="ebp";
-
-       &mov($r,&wparam(0));    # get r
-        &mov($a,&wparam(1));   # get a
-       &mov($b,&wparam(2));    # get b
-        &mov($num,&wparam(3)); # get num
-       &xor($c,$c);            # clear carry
-        &and($num,0xfffffff8); # num / 8
-
-       &jz(&label("aw_finish"));
-
-       &set_label("aw_loop",0);
-       for ($i=0; $i<8; $i++)
-               {
-               &comment("Round $i");
-
-               &mov($tmp1,&DWP($i*4,$a,"",0));         # *a
-                &mov($tmp2,&DWP($i*4,$b,"",0));        # *b
-               &sub($tmp1,$c);
-                &mov($c,0);
-               &adc($c,$c);
-                &sub($tmp1,$tmp2);
-               &adc($c,0);
-                &mov(&DWP($i*4,$r,"",0),$tmp1);        # *r
-               }
-
-       &comment("");
-       &add($a,32);
-        &add($b,32);
-       &add($r,32);
-        &sub($num,8);
-       &jnz(&label("aw_loop"));
-
-       &set_label("aw_finish",0);
-       &mov($num,&wparam(3));  # get num
-       &and($num,7);
-        &jz(&label("aw_end"));
-
-       for ($i=0; $i<7; $i++)
-               {
-               &comment("Tail Round $i");
-               &mov($tmp1,&DWP($i*4,$a,"",0)); # *a
-                &mov($tmp2,&DWP($i*4,$b,"",0));# *b
-               &sub($tmp1,$c);
-                &mov($c,0);
-               &adc($c,$c);
-                &sub($tmp1,$tmp2);
-               &adc($c,0);
-                &dec($num) if ($i != 6);
-               &mov(&DWP($i*4,$r,"",0),$tmp1); # *a
-                &jz(&label("aw_end")) if ($i != 6);
-               }
-       &set_label("aw_end",0);
-
-#      &mov("eax",$c);         # $c is "eax"
-
-       &function_end($name);
-       }
-
-1;

diff --git a/crypto/bn/bn.mul b/crypto/bn/bn.mul
deleted file mode 100644 (file)
index 9728870..0000000
--- a/crypto/bn/bn.mul
+++ /dev/null
@@ -1,19 +0,0 @@
-We need
-
-* bn_mul_comba8
-* bn_mul_comba4
-* bn_mul_normal
-* bn_mul_recursive
-
-* bn_sqr_comba8
-* bn_sqr_comba4
-bn_sqr_normal -> BN_sqr
-* bn_sqr_recursive
-
-* bn_mul_low_recursive
-* bn_mul_low_normal
-* bn_mul_high
-
-* bn_mul_part_recursive        # symetric but not power of 2
-
-bn_mul_asymetric_recursive # uneven, but do the chop up.

diff --git a/crypto/bn/bnspeed.c b/crypto/bn/bnspeed.c
deleted file mode 100644 (file)
index b554ac8..0000000
--- a/crypto/bn/bnspeed.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* unused */
-
-/* crypto/bn/bnspeed.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.]
- */
-
-/* most of this code has been pilfered from my libdes speed.c program */
-
-#define BASENUM        1000000
-#undef PROG
-#define PROG bnspeed_main
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/bn.h>
-#include <openssl/x509.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# 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
-
-#undef BUFSIZE
-#define BUFSIZE        ((long)1024*8)
-int run=0;
-
-static double Time_F(int s);
-#define START  0
-#define STOP   1
-
-static double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret < 1e-3)?1e-3:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-               return((ret < 0.001)?0.001:ret);
-               }
-#endif
-       }
-
-#define NUM_SIZES      5
-static int sizes[NUM_SIZES]={128,256,512,1024,2048};
-/*static int sizes[NUM_SIZES]={59,179,299,419,539}; */
-
-void do_mul(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_CTX *ctx); 
-
-int main(int argc, char **argv)
-       {
-       BN_CTX *ctx;
-       BIGNUM a,b,c;
-
-       ctx=BN_CTX_new();
-       BN_init(&a);
-       BN_init(&b);
-       BN_init(&c);
-
-       do_mul(&a,&b,&c,ctx);
-       }
-
-void do_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
-       {
-       int i,j,k;
-       double tm;
-       long num;
-
-       for (i=0; i<NUM_SIZES; i++)
-               {
-               num=BASENUM;
-               if (i) num/=(i*3);
-               BN_rand(a,sizes[i],1,0);
-               for (j=i; j<NUM_SIZES; j++)
-                       {
-                       BN_rand(b,sizes[j],1,0);
-                       Time_F(START);
-                       for (k=0; k<num; k++)
-                               BN_mul(r,b,a,ctx);
-                       tm=Time_F(STOP);
-                       printf("mul %4d x %4d -> %8.3fms\n",sizes[i],sizes[j],tm*1000.0/num);
-                       }
-               }
-
-       for (i=0; i<NUM_SIZES; i++)
-               {
-               num=BASENUM;
-               if (i) num/=(i*3);
-               BN_rand(a,sizes[i],1,0);
-               Time_F(START);
-               for (k=0; k<num; k++)
-                       BN_sqr(r,a,ctx);
-               tm=Time_F(STOP);
-               printf("sqr %4d x %4d -> %8.3fms\n",sizes[i],sizes[i],tm*1000.0/num);
-               }
-
-       for (i=0; i<NUM_SIZES; i++)
-               {
-               num=BASENUM/10;
-               if (i) num/=(i*3);
-               BN_rand(a,sizes[i]-1,1,0);
-               for (j=i; j<NUM_SIZES; j++)
-                       {
-                       BN_rand(b,sizes[j],1,0);
-                       Time_F(START);
-                       for (k=0; k<100000; k++)
-                               BN_div(r, NULL, b, a,ctx);
-                       tm=Time_F(STOP);
-                       printf("div %4d / %4d -> %8.3fms\n",sizes[j],sizes[i]-1,tm*1000.0/num);
-                       }
-               }
-       }
-

diff --git a/crypto/bn/divtest.c b/crypto/bn/divtest.c
deleted file mode 100644 (file)
index d3fc688..0000000
--- a/crypto/bn/divtest.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <openssl/bn.h>
-#include <openssl/rand.h>
-
-static int Rand(n)
-{
-    unsigned char x[2];
-    RAND_pseudo_bytes(x,2);
-    return (x[0] + 2*x[1]);
-}
-
-static void bug(char *m, BIGNUM *a, BIGNUM *b)
-{
-    printf("%s!\na=",m);
-    BN_print_fp(stdout, a);
-    printf("\nb=");
-    BN_print_fp(stdout, b);
-    printf("\n");
-    fflush(stdout);
-}
-
-main()
-{
-    BIGNUM *a=BN_new(), *b=BN_new(), *c=BN_new(), *d=BN_new(),
-       *C=BN_new(), *D=BN_new();
-    BN_RECP_CTX *recp=BN_RECP_CTX_new();
-    BN_CTX *ctx=BN_CTX_new();
-
-    for(;;) {
-       BN_pseudo_rand(a,Rand(),0,0);
-       BN_pseudo_rand(b,Rand(),0,0);
-       if (BN_is_zero(b)) continue;
-
-       BN_RECP_CTX_set(recp,b,ctx);
-       if (BN_div(C,D,a,b,ctx) != 1)
-           bug("BN_div failed",a,b);
-       if (BN_div_recp(c,d,a,recp,ctx) != 1)
-           bug("BN_div_recp failed",a,b);
-       else if (BN_cmp(c,C) != 0 || BN_cmp(c,C) != 0)
-           bug("mismatch",a,b);
-    }
-}

diff --git a/crypto/bn/exp.c b/crypto/bn/exp.c
deleted file mode 100644 (file)
index 4865b0e..0000000
--- a/crypto/bn/exp.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* unused */
-
-#include <stdio.h>
-#include <openssl/tmdiff.h>
-#include "bn_lcl.h"
-
-#define SIZE   256
-#define NUM    (8*8*8)
-#define MOD    (8*8*8*8*8)
-
-main(argc,argv)
-int argc;
-char *argv[];
-       {
-       BN_CTX ctx;
-       BIGNUM a,b,c,r,rr,t,l;
-       int j,i,size=SIZE,num=NUM,mod=MOD;
-       char *start,*end;
-       BN_MONT_CTX mont;
-       double d,md;
-
-       BN_MONT_CTX_init(&mont);
-       BN_CTX_init(&ctx);
-       BN_init(&a);
-       BN_init(&b);
-       BN_init(&c);
-       BN_init(&r);
-
-       start=ms_time_new();
-       end=ms_time_new();
-       while (size <= 1024*8)
-               {
-               BN_rand(&a,size,0,0);
-               BN_rand(&b,size,1,0);
-               BN_rand(&c,size,0,1);
-
-               BN_mod(&a,&a,&c,&ctx);
-
-               ms_time_get(start);
-               for (i=0; i<10; i++)
-                       BN_MONT_CTX_set(&mont,&c,&ctx);
-               ms_time_get(end);
-               md=ms_time_diff(start,end);
-
-               ms_time_get(start);
-               for (i=0; i<num; i++)
-                       {
-                       /* bn_mull(&r,&a,&b,&ctx); */
-                       /* BN_sqr(&r,&a,&ctx); */
-                       BN_mod_exp_mont(&r,&a,&b,&c,&ctx,&mont);
-                       }
-               ms_time_get(end);
-               d=ms_time_diff(start,end)/* *50/33 */;
-               printf("%5d bit:%6.2f %6d %6.4f %4d m_set(%5.4f)\n",size,
-                       d,num,d/num,(int)((d/num)*mod),md/10.0);
-               num/=8;
-               mod/=8;
-               if (num <= 0) num=1;
-               size*=2;
-               }
-
-       }

diff --git a/crypto/bn/expspeed.c b/crypto/bn/expspeed.c
deleted file mode 100644 (file)
index 4d5f221..0000000
--- a/crypto/bn/expspeed.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* unused */
-
-/* crypto/bn/expspeed.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.]
- */
-
-/* most of this code has been pilfered from my libdes speed.c program */
-
-#define BASENUM        5000
-#define NUM_START 0
-
-
-/* determine timings for modexp, modmul, modsqr, gcd, Kronecker symbol,
- * modular inverse, or modular square roots */
-#define TEST_EXP
-#undef TEST_MUL
-#undef TEST_SQR
-#undef TEST_GCD
-#undef TEST_KRON
-#undef TEST_INV
-#undef TEST_SQRT
-#define P_MOD_64 9 /* least significant 6 bits for prime to be used for BN_sqrt timings */
-
-#if defined(TEST_EXP) + defined(TEST_MUL) + defined(TEST_SQR) + defined(TEST_GCD) + defined(TEST_KRON) + defined(TEST_INV) +defined(TEST_SQRT) != 1
-#  error "choose one test"
-#endif
-
-#if defined(TEST_INV) || defined(TEST_SQRT)
-#  define C_PRIME
-static void genprime_cb(int p, int n, void *arg);
-#endif
-
-
-
-#undef PROG
-#define PROG bnspeed_main
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/bn.h>
-#include <openssl/x509.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# 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
-
-#undef BUFSIZE
-#define BUFSIZE        ((long)1024*8)
-int run=0;
-
-static double Time_F(int s);
-#define START  0
-#define STOP   1
-
-static double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret < 1e-3)?1e-3:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-               return((ret < 0.001)?0.001:ret);
-               }
-#endif
-       }
-
-#define NUM_SIZES      7
-#if NUM_START > NUM_SIZES
-#   error "NUM_START > NUM_SIZES"
-#endif
-static int sizes[NUM_SIZES]={128,256,512,1024,2048,4096,8192};
-static int mul_c[NUM_SIZES]={8*8*8*8*8*8,8*8*8*8*8,8*8*8*8,8*8*8,8*8,8,1};
-/*static int sizes[NUM_SIZES]={59,179,299,419,539}; */
-
-#define RAND_SEED(string) { const char str[] = string; RAND_seed(string, sizeof str); }
-
-void do_mul_exp(BIGNUM *r,BIGNUM *a,BIGNUM *b,BIGNUM *c,BN_CTX *ctx); 
-
-int main(int argc, char **argv)
-       {
-       BN_CTX *ctx;
-       BIGNUM *a,*b,*c,*r;
-
-#if 1
-       if (!CRYPTO_set_mem_debug_functions(0,0,0,0,0))
-               abort();
-#endif
-
-       ctx=BN_CTX_new();
-       a=BN_new();
-       b=BN_new();
-       c=BN_new();
-       r=BN_new();
-
-       while (!RAND_status())
-               /* not enough bits */
-               RAND_SEED("I demand a manual recount!");
-
-       do_mul_exp(r,a,b,c,ctx);
-       return 0;
-       }
-
-void do_mul_exp(BIGNUM *r, BIGNUM *a, BIGNUM *b, BIGNUM *c, BN_CTX *ctx)
-       {
-       int i,k;
-       double tm;
-       long num;
-
-       num=BASENUM;
-       for (i=NUM_START; i<NUM_SIZES; i++)
-               {
-#ifdef C_PRIME
-#  ifdef TEST_SQRT
-               if (!BN_set_word(a, 64)) goto err;
-               if (!BN_set_word(b, P_MOD_64)) goto err;
-#    define ADD a
-#    define REM b
-#  else
-#    define ADD NULL
-#    define REM NULL
-#  endif
-               if (!BN_generate_prime(c,sizes[i],0,ADD,REM,genprime_cb,NULL)) goto err;
-               putc('\n', stderr);
-               fflush(stderr);
-#endif
-
-               for (k=0; k<num; k++)
-                       {
-                       if (k%50 == 0) /* Average over num/50 different choices of random numbers. */
-                               {
-                               if (!BN_pseudo_rand(a,sizes[i],1,0)) goto err;
-
-                               if (!BN_pseudo_rand(b,sizes[i],1,0)) goto err;
-
-#ifndef C_PRIME
-                               if (!BN_pseudo_rand(c,sizes[i],1,1)) goto err;
-#endif
-
-#ifdef TEST_SQRT                               
-                               if (!BN_mod_sqr(a,a,c,ctx)) goto err;
-                               if (!BN_mod_sqr(b,b,c,ctx)) goto err;
-#else
-                               if (!BN_nnmod(a,a,c,ctx)) goto err;
-                               if (!BN_nnmod(b,b,c,ctx)) goto err;
-#endif
-
-                               if (k == 0)
-                                       Time_F(START);
-                               }
-
-#if defined(TEST_EXP)
-                       if (!BN_mod_exp(r,a,b,c,ctx)) goto err;
-#elif defined(TEST_MUL)
-                       {
-                       int i = 0;
-                       for (i = 0; i < 50; i++)
-                               if (!BN_mod_mul(r,a,b,c,ctx)) goto err;
-                       }
-#elif defined(TEST_SQR)
-                       {
-                       int i = 0;
-                       for (i = 0; i < 50; i++)
-                               {
-                               if (!BN_mod_sqr(r,a,c,ctx)) goto err;
-                               if (!BN_mod_sqr(r,b,c,ctx)) goto err;
-                               }
-                       }
-#elif defined(TEST_GCD)
-                       if (!BN_gcd(r,a,b,ctx)) goto err;
-                       if (!BN_gcd(r,b,c,ctx)) goto err;
-                       if (!BN_gcd(r,c,a,ctx)) goto err;
-#elif defined(TEST_KRON)
-                       if (-2 == BN_kronecker(a,b,ctx)) goto err;
-                       if (-2 == BN_kronecker(b,c,ctx)) goto err;
-                       if (-2 == BN_kronecker(c,a,ctx)) goto err;
-#elif defined(TEST_INV)
-                       if (!BN_mod_inverse(r,a,c,ctx)) goto err;
-                       if (!BN_mod_inverse(r,b,c,ctx)) goto err;
-#else /* TEST_SQRT */
-                       if (!BN_mod_sqrt(r,a,c,ctx)) goto err;
-                       if (!BN_mod_sqrt(r,b,c,ctx)) goto err;
-#endif
-                       }
-               tm=Time_F(STOP);
-               printf(
-#if defined(TEST_EXP)
-                       "modexp %4d ^ %4d %% %4d"
-#elif defined(TEST_MUL)
-                       "50*modmul %4d %4d %4d"
-#elif defined(TEST_SQR)
-                       "100*modsqr %4d %4d %4d"
-#elif defined(TEST_GCD)
-                       "3*gcd %4d %4d %4d"
-#elif defined(TEST_KRON)
-                       "3*kronecker %4d %4d %4d"
-#elif defined(TEST_INV)
-                       "2*inv %4d %4d mod %4d"
-#else /* TEST_SQRT */
-                       "2*sqrt [prime == %d (mod 64)] %4d %4d mod %4d"
-#endif
-                       " -> %8.6fms %5.1f (%ld)\n",
-#ifdef TEST_SQRT
-                       P_MOD_64,
-#endif
-                       sizes[i],sizes[i],sizes[i],tm*1000.0/num,tm*mul_c[i]/num, num);
-               num/=7;
-               if (num <= 0) num=1;
-               }
-       return;
-
- err:
-       ERR_print_errors_fp(stderr);
-       }
-
-
-#ifdef C_PRIME
-static void genprime_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';
-       putc(c, stderr);
-       fflush(stderr);
-       (void)n;
-       (void)arg;
-       }
-#endif

diff --git a/crypto/bn/todo b/crypto/bn/todo
deleted file mode 100644 (file)
index 61e970f..0000000
--- a/crypto/bn/todo
+++ /dev/null
@@ -1,3 +0,0 @@
-Cache RECP_CTX values
-make the result argument independent of the inputs.
-split up the _exp_ functions

diff --git a/crypto/cast/cast_spd.c b/crypto/cast/cast_spd.c
deleted file mode 100644 (file)
index d650af4..0000000
--- a/crypto/cast/cast_spd.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/* crypto/cast/cast_spd.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.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/cast.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-#ifndef CLK_TCK
-#define HZ     100.0
-#else /* CLK_TCK */
-#define HZ ((double)CLK_TCK)
-#endif
-#endif
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static unsigned char key[] ={
-                       0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                       0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-                       };
-       CAST_KEY sch;
-       double a,b,c,d;
-#ifndef SIGALRM
-       long ca,cb,cc;
-#endif
-
-#ifndef TIMES
-       printf("To get the most accurate results, try to run this\n");
-       printf("program when this computer is idle.\n");
-#endif
-
-#ifndef SIGALRM
-       printf("First we calculate the approximate speed ...\n");
-       CAST_set_key(&sch,16,key);
-       count=10;
-       do      {
-               long i;
-               CAST_LONG data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       CAST_encrypt(data,&sch);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count/512;
-       cb=count;
-       cc=count*8/BUFSIZE+1;
-       printf("Doing CAST_set_key %ld times\n",ca);
-#define COND(d)        (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)        (run)
-#define COUNT(d) (count)
-       signal(SIGALRM,sig_done);
-       printf("Doing CAST_set_key for 10 seconds\n");
-       alarm(10);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(ca); count+=4)
-               {
-               CAST_set_key(&sch,16,key);
-               CAST_set_key(&sch,16,key);
-               CAST_set_key(&sch,16,key);
-               CAST_set_key(&sch,16,key);
-               }
-       d=Time_F(STOP);
-       printf("%ld cast set_key's in %.2f seconds\n",count,d);
-       a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-       printf("Doing CAST_encrypt's for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing CAST_encrypt %ld times\n",cb);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cb); count+=4)
-               {
-               CAST_LONG data[2];
-
-               CAST_encrypt(data,&sch);
-               CAST_encrypt(data,&sch);
-               CAST_encrypt(data,&sch);
-               CAST_encrypt(data,&sch);
-               }
-       d=Time_F(STOP);
-       printf("%ld CAST_encrypt's in %.2f second\n",count,d);
-       b=((double)COUNT(cb)*8)/d;
-
-#ifdef SIGALRM
-       printf("Doing CAST_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-               BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing CAST_cbc_encrypt %ld times on %ld byte blocks\n",cc,
-               BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cc); count++)
-               CAST_cbc_encrypt(buf,buf,BUFSIZE,&sch,
-                       &(key[0]),CAST_ENCRYPT);
-       d=Time_F(STOP);
-       printf("%ld CAST_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       c=((double)COUNT(cc)*BUFSIZE)/d;
-
-       printf("CAST set_key       per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a);
-       printf("CAST raw ecb bytes per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b);
-       printf("CAST cbc     bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c);
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }
-

diff --git a/crypto/cast/castopts.c b/crypto/cast/castopts.c
deleted file mode 100644 (file)
index 33b2c7b..0000000
--- a/crypto/cast/castopts.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* crypto/cast/castopts.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.]
- */
-
-/* define PART1, PART2, PART3 or PART4 to build only with a few of the options.
- * This is for machines with 64k code segment size restrictions. */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/cast.h>
-
-#define CAST_DEFAULT_OPTIONS
-
-#undef E_CAST
-#define CAST_encrypt  CAST_encrypt_normal
-#define CAST_decrypt  CAST_decrypt_normal
-#define CAST_cbc_encrypt  CAST_cbc_encrypt_normal
-#undef HEADER_CAST_LOCL_H
-#include "c_enc.c"
-
-#define CAST_PTR
-#undef CAST_PTR2
-#undef E_CAST
-#undef CAST_encrypt
-#undef CAST_decrypt
-#undef CAST_cbc_encrypt
-#define CAST_encrypt  CAST_encrypt_ptr
-#define CAST_decrypt  CAST_decrypt_ptr
-#define CAST_cbc_encrypt  CAST_cbc_encrypt_ptr
-#undef HEADER_CAST_LOCL_H
-#include "c_enc.c"
-
-#undef CAST_PTR
-#define CAST_PTR2
-#undef E_CAST
-#undef CAST_encrypt
-#undef CAST_decrypt
-#undef CAST_cbc_encrypt
-#define CAST_encrypt  CAST_encrypt_ptr2
-#define CAST_decrypt  CAST_decrypt_ptr2
-#define CAST_cbc_encrypt  CAST_cbc_encrypt_ptr2
-#undef HEADER_CAST_LOCL_H
-#include "c_enc.c"
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# ifndef CLK_TCK
-#  ifndef _BSD_CLK_TCK_ /* FreeBSD fix */
-#   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
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-#ifdef SIGALRM
-#define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10);
-#else
-#define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb);
-#endif
-       
-#define time_it(func,name,index) \
-       print_name(name); \
-       Time_F(START); \
-       for (count=0,run=1; COND(cb); count+=4) \
-               { \
-               unsigned long d[2]; \
-               func(d,&sch); \
-               func(d,&sch); \
-               func(d,&sch); \
-               func(d,&sch); \
-               } \
-       tm[index]=Time_F(STOP); \
-       fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \
-       tm[index]=((double)COUNT(cb))/tm[index];
-
-#define print_it(name,index) \
-       fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \
-               tm[index]*8,1.0e6/tm[index]);
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static char key[16]={   0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                               0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
-       CAST_KEY sch;
-       double d,tm[16],max=0;
-       int rank[16];
-       char *str[16];
-       int max_idx=0,i,num=0,j;
-#ifndef SIGALARM
-       long ca,cb,cc,cd,ce;
-#endif
-
-       for (i=0; i<12; i++)
-               {
-               tm[i]=0.0;
-               rank[i]=0;
-               }
-
-#ifndef TIMES
-       fprintf(stderr,"To get the most accurate results, try to run this\n");
-       fprintf(stderr,"program when this computer is idle.\n");
-#endif
-
-       CAST_set_key(&sch,16,key);
-
-#ifndef SIGALRM
-       fprintf(stderr,"First we calculate the approximate speed ...\n");
-       count=10;
-       do      {
-               long i;
-               unsigned long data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       CAST_encrypt(data,&sch);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count;
-       cb=count*3;
-       cc=count*3*8/BUFSIZE+1;
-       cd=count*8/BUFSIZE+1;
-
-       ce=count/20+1;
-#define COND(d) (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c) (run)
-#define COUNT(d) (count)
-        signal(SIGALRM,sig_done);
-        alarm(10);
-#endif
-
-       time_it(CAST_encrypt_normal,    "CAST_encrypt_normal ", 0);
-       time_it(CAST_encrypt_ptr,       "CAST_encrypt_ptr    ", 1);
-       time_it(CAST_encrypt_ptr2,      "CAST_encrypt_ptr2   ", 2);
-       num+=3;
-
-       str[0]="<nothing>";
-       print_it("CAST_encrypt_normal ",0);
-       max=tm[0];
-       max_idx=0;
-       str[1]="ptr      ";
-       print_it("CAST_encrypt_ptr ",1);
-       if (max < tm[1]) { max=tm[1]; max_idx=1; }
-       str[2]="ptr2     ";
-       print_it("CAST_encrypt_ptr2 ",2);
-       if (max < tm[2]) { max=tm[2]; max_idx=2; }
-
-       printf("options    CAST ecb/s\n");
-       printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]);
-       d=tm[max_idx];
-       tm[max_idx]= -2.0;
-       max= -1.0;
-       for (;;)
-               {
-               for (i=0; i<3; i++)
-                       {
-                       if (max < tm[i]) { max=tm[i]; j=i; }
-                       }
-               if (max < 0.0) break;
-               printf("%s %12.2f  %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0);
-               tm[j]= -2.0;
-               max= -1.0;
-               }
-
-       switch (max_idx)
-               {
-       case 0:
-               printf("-DCAST_DEFAULT_OPTIONS\n");
-               break;
-       case 1:
-               printf("-DCAST_PTR\n");
-               break;
-       case 2:
-               printf("-DCAST_PTR2\n");
-               break;
-               }
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }
-

diff --git a/crypto/des/des_opts.c b/crypto/des/des_opts.c
deleted file mode 100644 (file)
index 2df8296..0000000
--- a/crypto/des/des_opts.c
+++ /dev/null
@@ -1,608 +0,0 @@
-/* crypto/des/des_opts.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.]
- */
-
-/* define PART1, PART2, PART3 or PART4 to build only with a few of the options.
- * This is for machines with 64k code segment size restrictions. */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-#ifndef OPENSSL_SYS_MSDOS
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD
-#else
-#include <io.h>
-extern void exit();
-#endif
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/des.h>
-#include "spr.h"
-
-#define DES_DEFAULT_OPTIONS
-
-#if !defined(PART1) && !defined(PART2) && !defined(PART3) && !defined(PART4)
-#define PART1
-#define PART2
-#define PART3
-#define PART4
-#endif
-
-#ifdef PART1
-
-#undef DES_UNROLL
-#undef DES_RISC1
-#undef DES_RISC2
-#undef DES_PTR
-#undef D_ENCRYPT
-#define DES_encrypt1 des_encrypt_u4_cisc_idx
-#define DES_encrypt2 des_encrypt2_u4_cisc_idx
-#define DES_encrypt3 des_encrypt3_u4_cisc_idx
-#define DES_decrypt3 des_decrypt3_u4_cisc_idx
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#define DES_UNROLL
-#undef DES_RISC1
-#undef DES_RISC2
-#undef DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u16_cisc_idx
-#define DES_encrypt2 des_encrypt2_u16_cisc_idx
-#define DES_encrypt3 des_encrypt3_u16_cisc_idx
-#define DES_decrypt3 des_decrypt3_u16_cisc_idx
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#undef DES_UNROLL
-#define DES_RISC1
-#undef DES_RISC2
-#undef DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u4_risc1_idx
-#define DES_encrypt2 des_encrypt2_u4_risc1_idx
-#define DES_encrypt3 des_encrypt3_u4_risc1_idx
-#define DES_decrypt3 des_decrypt3_u4_risc1_idx
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#endif
-
-#ifdef PART2
-
-#undef DES_UNROLL
-#undef DES_RISC1
-#define DES_RISC2
-#undef DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u4_risc2_idx
-#define DES_encrypt2 des_encrypt2_u4_risc2_idx
-#define DES_encrypt3 des_encrypt3_u4_risc2_idx
-#define DES_decrypt3 des_decrypt3_u4_risc2_idx
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#define DES_UNROLL
-#define DES_RISC1
-#undef DES_RISC2
-#undef DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u16_risc1_idx
-#define DES_encrypt2 des_encrypt2_u16_risc1_idx
-#define DES_encrypt3 des_encrypt3_u16_risc1_idx
-#define DES_decrypt3 des_decrypt3_u16_risc1_idx
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#define DES_UNROLL
-#undef DES_RISC1
-#define DES_RISC2
-#undef DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u16_risc2_idx
-#define DES_encrypt2 des_encrypt2_u16_risc2_idx
-#define DES_encrypt3 des_encrypt3_u16_risc2_idx
-#define DES_decrypt3 des_decrypt3_u16_risc2_idx
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#endif
-
-#ifdef PART3
-
-#undef DES_UNROLL
-#undef DES_RISC1
-#undef DES_RISC2
-#define DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u4_cisc_ptr
-#define DES_encrypt2 des_encrypt2_u4_cisc_ptr
-#define DES_encrypt3 des_encrypt3_u4_cisc_ptr
-#define DES_decrypt3 des_decrypt3_u4_cisc_ptr
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#define DES_UNROLL
-#undef DES_RISC1
-#undef DES_RISC2
-#define DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u16_cisc_ptr
-#define DES_encrypt2 des_encrypt2_u16_cisc_ptr
-#define DES_encrypt3 des_encrypt3_u16_cisc_ptr
-#define DES_decrypt3 des_decrypt3_u16_cisc_ptr
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#undef DES_UNROLL
-#define DES_RISC1
-#undef DES_RISC2
-#define DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u4_risc1_ptr
-#define DES_encrypt2 des_encrypt2_u4_risc1_ptr
-#define DES_encrypt3 des_encrypt3_u4_risc1_ptr
-#define DES_decrypt3 des_decrypt3_u4_risc1_ptr
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#endif
-
-#ifdef PART4
-
-#undef DES_UNROLL
-#undef DES_RISC1
-#define DES_RISC2
-#define DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u4_risc2_ptr
-#define DES_encrypt2 des_encrypt2_u4_risc2_ptr
-#define DES_encrypt3 des_encrypt3_u4_risc2_ptr
-#define DES_decrypt3 des_decrypt3_u4_risc2_ptr
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#define DES_UNROLL
-#define DES_RISC1
-#undef DES_RISC2
-#define DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u16_risc1_ptr
-#define DES_encrypt2 des_encrypt2_u16_risc1_ptr
-#define DES_encrypt3 des_encrypt3_u16_risc1_ptr
-#define DES_decrypt3 des_decrypt3_u16_risc1_ptr
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#define DES_UNROLL
-#undef DES_RISC1
-#define DES_RISC2
-#define DES_PTR
-#undef D_ENCRYPT
-#undef DES_encrypt1
-#undef DES_encrypt2
-#undef DES_encrypt3
-#undef DES_decrypt3
-#define DES_encrypt1 des_encrypt_u16_risc2_ptr
-#define DES_encrypt2 des_encrypt2_u16_risc2_ptr
-#define DES_encrypt3 des_encrypt3_u16_risc2_ptr
-#define DES_decrypt3 des_decrypt3_u16_risc2_ptr
-#undef HEADER_DES_LOCL_H
-#include "des_enc.c"
-
-#endif
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# ifndef CLK_TCK
-#  ifndef _BSD_CLK_TCK_ /* FreeBSD fix */
-#   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
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1000.0;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-#ifdef SIGALRM
-#define print_name(name) fprintf(stderr,"Doing %s's for 10 seconds\n",name); alarm(10);
-#else
-#define print_name(name) fprintf(stderr,"Doing %s %ld times\n",name,cb);
-#endif
-       
-#define time_it(func,name,index) \
-       print_name(name); \
-       Time_F(START); \
-       for (count=0,run=1; COND(cb); count++) \
-               { \
-               unsigned long d[2]; \
-               func(d,&sch,DES_ENCRYPT); \
-               } \
-       tm[index]=Time_F(STOP); \
-       fprintf(stderr,"%ld %s's in %.2f second\n",count,name,tm[index]); \
-       tm[index]=((double)COUNT(cb))/tm[index];
-
-#define print_it(name,index) \
-       fprintf(stderr,"%s bytes per sec = %12.2f (%5.1fuS)\n",name, \
-               tm[index]*8,1.0e6/tm[index]);
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
-       static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
-       static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
-       DES_key_schedule sch,sch2,sch3;
-       double d,tm[16],max=0;
-       int rank[16];
-       char *str[16];
-       int max_idx=0,i,num=0,j;
-#ifndef SIGALARM
-       long ca,cb,cc,cd,ce;
-#endif
-
-       for (i=0; i<12; i++)
-               {
-               tm[i]=0.0;
-               rank[i]=0;
-               }
-
-#ifndef TIMES
-       fprintf(stderr,"To get the most accurate results, try to run this\n");
-       fprintf(stderr,"program when this computer is idle.\n");
-#endif
-
-       DES_set_key_unchecked(&key,&sch);
-       DES_set_key_unchecked(&key2,&sch2);
-       DES_set_key_unchecked(&key3,&sch3);
-
-#ifndef SIGALRM
-       fprintf(stderr,"First we calculate the approximate speed ...\n");
-       DES_set_key_unchecked(&key,sch);
-       count=10;
-       do      {
-               long i;
-               unsigned long data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       DES_encrypt1(data,&(sch[0]),DES_ENCRYPT);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count;
-       cb=count*3;
-       cc=count*3*8/BUFSIZE+1;
-       cd=count*8/BUFSIZE+1;
-
-       ce=count/20+1;
-#define COND(d) (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c) (run)
-#define COUNT(d) (count)
-        signal(SIGALRM,sig_done);
-        alarm(10);
-#endif
-
-#ifdef PART1
-       time_it(des_encrypt_u4_cisc_idx,  "des_encrypt_u4_cisc_idx  ", 0);
-       time_it(des_encrypt_u16_cisc_idx, "des_encrypt_u16_cisc_idx ", 1);
-       time_it(des_encrypt_u4_risc1_idx, "des_encrypt_u4_risc1_idx ", 2);
-       num+=3;
-#endif
-#ifdef PART2
-       time_it(des_encrypt_u16_risc1_idx,"des_encrypt_u16_risc1_idx", 3);
-       time_it(des_encrypt_u4_risc2_idx, "des_encrypt_u4_risc2_idx ", 4);
-       time_it(des_encrypt_u16_risc2_idx,"des_encrypt_u16_risc2_idx", 5);
-       num+=3;
-#endif
-#ifdef PART3
-       time_it(des_encrypt_u4_cisc_ptr,  "des_encrypt_u4_cisc_ptr  ", 6);
-       time_it(des_encrypt_u16_cisc_ptr, "des_encrypt_u16_cisc_ptr ", 7);
-       time_it(des_encrypt_u4_risc1_ptr, "des_encrypt_u4_risc1_ptr ", 8);
-       num+=3;
-#endif
-#ifdef PART4
-       time_it(des_encrypt_u16_risc1_ptr,"des_encrypt_u16_risc1_ptr", 9);
-       time_it(des_encrypt_u4_risc2_ptr, "des_encrypt_u4_risc2_ptr ",10);
-       time_it(des_encrypt_u16_risc2_ptr,"des_encrypt_u16_risc2_ptr",11);
-       num+=3;
-#endif
-
-#ifdef PART1
-       str[0]=" 4  c i";
-       print_it("des_encrypt_u4_cisc_idx  ",0);
-       max=tm[0];
-       max_idx=0;
-       str[1]="16  c i";
-       print_it("des_encrypt_u16_cisc_idx ",1);
-       if (max < tm[1]) { max=tm[1]; max_idx=1; }
-       str[2]=" 4 r1 i";
-       print_it("des_encrypt_u4_risc1_idx ",2);
-       if (max < tm[2]) { max=tm[2]; max_idx=2; }
-#endif
-#ifdef PART2
-       str[3]="16 r1 i";
-       print_it("des_encrypt_u16_risc1_idx",3);
-       if (max < tm[3]) { max=tm[3]; max_idx=3; }
-       str[4]=" 4 r2 i";
-       print_it("des_encrypt_u4_risc2_idx ",4);
-       if (max < tm[4]) { max=tm[4]; max_idx=4; }
-       str[5]="16 r2 i";
-       print_it("des_encrypt_u16_risc2_idx",5);
-       if (max < tm[5]) { max=tm[5]; max_idx=5; }
-#endif
-#ifdef PART3
-       str[6]=" 4  c p";
-       print_it("des_encrypt_u4_cisc_ptr  ",6);
-       if (max < tm[6]) { max=tm[6]; max_idx=6; }
-       str[7]="16  c p";
-       print_it("des_encrypt_u16_cisc_ptr ",7);
-       if (max < tm[7]) { max=tm[7]; max_idx=7; }
-       str[8]=" 4 r1 p";
-       print_it("des_encrypt_u4_risc1_ptr ",8);
-       if (max < tm[8]) { max=tm[8]; max_idx=8; }
-#endif
-#ifdef PART4
-       str[9]="16 r1 p";
-       print_it("des_encrypt_u16_risc1_ptr",9);
-       if (max < tm[9]) { max=tm[9]; max_idx=9; }
-       str[10]=" 4 r2 p";
-       print_it("des_encrypt_u4_risc2_ptr ",10);
-       if (max < tm[10]) { max=tm[10]; max_idx=10; }
-       str[11]="16 r2 p";
-       print_it("des_encrypt_u16_risc2_ptr",11);
-       if (max < tm[11]) { max=tm[11]; max_idx=11; }
-#endif
-       printf("options    des ecb/s\n");
-       printf("%s %12.2f 100.0%%\n",str[max_idx],tm[max_idx]);
-       d=tm[max_idx];
-       tm[max_idx]= -2.0;
-       max= -1.0;
-       for (;;)
-               {
-               for (i=0; i<12; i++)
-                       {
-                       if (max < tm[i]) { max=tm[i]; j=i; }
-                       }
-               if (max < 0.0) break;
-               printf("%s %12.2f  %4.1f%%\n",str[j],tm[j],tm[j]/d*100.0);
-               tm[j]= -2.0;
-               max= -1.0;
-               }
-
-       switch (max_idx)
-               {
-       case 0:
-               printf("-DDES_DEFAULT_OPTIONS\n");
-               break;
-       case 1:
-               printf("-DDES_UNROLL\n");
-               break;
-       case 2:
-               printf("-DDES_RISC1\n");
-               break;
-       case 3:
-               printf("-DDES_UNROLL -DDES_RISC1\n");
-               break;
-       case 4:
-               printf("-DDES_RISC2\n");
-               break;
-       case 5:
-               printf("-DDES_UNROLL -DDES_RISC2\n");
-               break;
-       case 6:
-               printf("-DDES_PTR\n");
-               break;
-       case 7:
-               printf("-DDES_UNROLL -DDES_PTR\n");
-               break;
-       case 8:
-               printf("-DDES_RISC1 -DDES_PTR\n");
-               break;
-       case 9:
-               printf("-DDES_UNROLL -DDES_RISC1 -DDES_PTR\n");
-               break;
-       case 10:
-               printf("-DDES_RISC2 -DDES_PTR\n");
-               break;
-       case 11:
-               printf("-DDES_UNROLL -DDES_RISC2 -DDES_PTR\n");
-               break;
-               }
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }

diff --git a/crypto/des/speed.c b/crypto/des/speed.c
deleted file mode 100644 (file)
index 1616f4b..0000000
--- a/crypto/des/speed.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* crypto/des/speed.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.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#define crypt(c,s) (des_crypt((c),(s)))
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/des.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-# ifndef CLK_TCK
-#  ifndef _BSD_CLK_TCK_ /* FreeBSD fix */
-#   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
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
-       static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
-       static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
-       DES_key_schedule sch,sch2,sch3;
-       double a,b,c,d,e;
-#ifndef SIGALRM
-       long ca,cb,cc,cd,ce;
-#endif
-
-#ifndef TIMES
-       printf("To get the most accurate results, try to run this\n");
-       printf("program when this computer is idle.\n");
-#endif
-
-       DES_set_key_unchecked(&key2,&sch2);
-       DES_set_key_unchecked(&key3,&sch3);
-
-#ifndef SIGALRM
-       printf("First we calculate the approximate speed ...\n");
-       DES_set_key_unchecked(&key,&sch);
-       count=10;
-       do      {
-               long i;
-               DES_LONG data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       DES_encrypt1(data,&sch,DES_ENCRYPT);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count;
-       cb=count*3;
-       cc=count*3*8/BUFSIZE+1;
-       cd=count*8/BUFSIZE+1;
-       ce=count/20+1;
-       printf("Doing set_key %ld times\n",ca);
-#define COND(d)        (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)        (run)
-#define COUNT(d) (count)
-       signal(SIGALRM,sig_done);
-       printf("Doing set_key for 10 seconds\n");
-       alarm(10);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(ca); count++)
-               DES_set_key_unchecked(&key,&sch);
-       d=Time_F(STOP);
-       printf("%ld set_key's in %.2f seconds\n",count,d);
-       a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-       printf("Doing DES_encrypt's for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing DES_encrypt %ld times\n",cb);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cb); count++)
-               {
-               DES_LONG data[2];
-
-               DES_encrypt1(data,&sch,DES_ENCRYPT);
-               }
-       d=Time_F(STOP);
-       printf("%ld DES_encrypt's in %.2f second\n",count,d);
-       b=((double)COUNT(cb)*8)/d;
-
-#ifdef SIGALRM
-       printf("Doing DES_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-               BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing DES_cbc_encrypt %ld times on %ld byte blocks\n",cc,
-               BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cc); count++)
-               DES_ncbc_encrypt(buf,buf,BUFSIZE,&sch,
-                       &key,DES_ENCRYPT);
-       d=Time_F(STOP);
-       printf("%ld DES_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       c=((double)COUNT(cc)*BUFSIZE)/d;
-
-#ifdef SIGALRM
-       printf("Doing DES_ede_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-               BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing DES_ede_cbc_encrypt %ld times on %ld byte blocks\n",cd,
-               BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cd); count++)
-               DES_ede3_cbc_encrypt(buf,buf,BUFSIZE,
-                       &sch,
-                       &sch2,
-                       &sch3,
-                       &key,
-                       DES_ENCRYPT);
-       d=Time_F(STOP);
-       printf("%ld DES_ede_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       d=((double)COUNT(cd)*BUFSIZE)/d;
-
-#ifdef SIGALRM
-       printf("Doing crypt for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing crypt %ld times\n",ce);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(ce); count++)
-               crypt("testing1","ef");
-       e=Time_F(STOP);
-       printf("%ld crypts in %.2f second\n",count,e);
-       e=((double)COUNT(ce))/e;
-
-       printf("set_key            per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a);
-       printf("DES raw ecb bytes  per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b);
-       printf("DES cbc bytes      per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c);
-       printf("DES ede cbc bytes  per sec = %12.2f (%9.3fuS)\n",d,8.0e6/d);
-       printf("crypt              per sec = %12.2f (%9.3fuS)\n",e,1.0e6/e);
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }

diff --git a/crypto/dh/p1024.c b/crypto/dh/p1024.c
deleted file mode 100644 (file)
index 368ceca..0000000
--- a/crypto/dh/p1024.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* crypto/dh/p1024.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/bn.h>
-#include <openssl/asn1.h>
-#include <openssl/dh.h>
-#include <openssl/pem.h>
-
-unsigned char data[]={0x97,0xF6,0x42,0x61,0xCA,0xB5,0x05,0xDD,
-       0x28,0x28,0xE1,0x3F,0x1D,0x68,0xB6,0xD3,
-       0xDB,0xD0,0xF3,0x13,0x04,0x7F,0x40,0xE8,
-       0x56,0xDA,0x58,0xCB,0x13,0xB8,0xA1,0xBF,
-       0x2B,0x78,0x3A,0x4C,0x6D,0x59,0xD5,0xF9,
-       0x2A,0xFC,0x6C,0xFF,0x3D,0x69,0x3F,0x78,
-       0xB2,0x3D,0x4F,0x31,0x60,0xA9,0x50,0x2E,
-       0x3E,0xFA,0xF7,0xAB,0x5E,0x1A,0xD5,0xA6,
-       0x5E,0x55,0x43,0x13,0x82,0x8D,0xA8,0x3B,
-       0x9F,0xF2,0xD9,0x41,0xDE,0xE9,0x56,0x89,
-       0xFA,0xDA,0xEA,0x09,0x36,0xAD,0xDF,0x19,
-       0x71,0xFE,0x63,0x5B,0x20,0xAF,0x47,0x03,
-       0x64,0x60,0x3C,0x2D,0xE0,0x59,0xF5,0x4B,
-       0x65,0x0A,0xD8,0xFA,0x0C,0xF7,0x01,0x21,
-       0xC7,0x47,0x99,0xD7,0x58,0x71,0x32,0xBE,
-       0x9B,0x99,0x9B,0xB9,0xB7,0x87,0xE8,0xAB,
-       };
-
-main()
-       {
-       DH *dh;
-
-       dh=DH_new();
-       dh->p=BN_bin2bn(data,sizeof(data),NULL);
-       dh->g=BN_new();
-       BN_set_word(dh->g,2);
-       PEM_write_DHparams(stdout,dh);
-       }

diff --git a/crypto/dh/p192.c b/crypto/dh/p192.c
deleted file mode 100644 (file)
index 7bdf404..0000000
--- a/crypto/dh/p192.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* crypto/dh/p192.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/bn.h>
-#include <openssl/asn1.h>
-#include <openssl/dh.h>
-#include <openssl/pem.h>
-
-unsigned char data[]={
-0xD4,0xA0,0xBA,0x02,0x50,0xB6,0xFD,0x2E,
-0xC6,0x26,0xE7,0xEF,0xD6,0x37,0xDF,0x76,
-0xC7,0x16,0xE2,0x2D,0x09,0x44,0xB8,0x8B,
-       };
-
-main()
-       {
-       DH *dh;
-
-       dh=DH_new();
-       dh->p=BN_bin2bn(data,sizeof(data),NULL);
-       dh->g=BN_new();
-       BN_set_word(dh->g,3);
-       PEM_write_DHparams(stdout,dh);
-       }

diff --git a/crypto/dh/p512.c b/crypto/dh/p512.c
deleted file mode 100644 (file)
index a9b6aa8..0000000
--- a/crypto/dh/p512.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* crypto/dh/p512.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/bn.h>
-#include <openssl/asn1.h>
-#include <openssl/dh.h>
-#include <openssl/pem.h>
-
-unsigned char data[]={
-0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,
-0xD0,0xE4,0xAF,0x75,0x6F,0x4C,0xCA,0x92,
-0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
-0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,
-0x57,0x46,0x50,0xD3,0x69,0x99,0xDB,0x29,
-0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
-0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,
-0xD8,0x00,0x3E,0x7C,0x47,0x74,0xE8,0x33,
-       };
-
-main()
-       {
-       DH *dh;
-
-       dh=DH_new();
-       dh->p=BN_bin2bn(data,sizeof(data),NULL);
-       dh->g=BN_new();
-       BN_set_word(dh->g,2);
-       PEM_write_DHparams(stdout,dh);
-       }

diff --git a/crypto/idea/idea_spd.c b/crypto/idea/idea_spd.c
deleted file mode 100644 (file)
index 699353e..0000000
--- a/crypto/idea/idea_spd.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* crypto/idea/idea_spd.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.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/idea.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-#ifndef CLK_TCK
-#define HZ     100.0
-#else /* CLK_TCK */
-#define HZ ((double)CLK_TCK)
-#endif
-#endif
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static unsigned char key[] ={
-                       0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                       0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-                       };
-       IDEA_KEY_SCHEDULE sch;
-       double a,aa,b,c,d;
-#ifndef SIGALRM
-       long ca,cca,cb,cc;
-#endif
-
-#ifndef TIMES
-       printf("To get the most accurate results, try to run this\n");
-       printf("program when this computer is idle.\n");
-#endif
-
-#ifndef SIGALRM
-       printf("First we calculate the approximate speed ...\n");
-       idea_set_encrypt_key(key,&sch);
-       count=10;
-       do      {
-               long i;
-               IDEA_INT data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       idea_encrypt(data,&sch);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count/4;
-       cca=count/200;
-       cb=count;
-       cc=count*8/BUFSIZE+1;
-       printf("idea_set_encrypt_key %ld times\n",ca);
-#define COND(d)        (count <= (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)        (run)
-#define COUNT(d) (count)
-       signal(SIGALRM,sig_done);
-       printf("Doing idea_set_encrypt_key for 10 seconds\n");
-       alarm(10);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(ca); count+=4)
-               {
-               idea_set_encrypt_key(key,&sch);
-               idea_set_encrypt_key(key,&sch);
-               idea_set_encrypt_key(key,&sch);
-               idea_set_encrypt_key(key,&sch);
-               }
-       d=Time_F(STOP);
-       printf("%ld idea idea_set_encrypt_key's in %.2f seconds\n",count,d);
-       a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-       printf("Doing idea_set_decrypt_key for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing idea_set_decrypt_key %ld times\n",cca);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(cca); count+=4)
-               {
-               idea_set_decrypt_key(&sch,&sch);
-               idea_set_decrypt_key(&sch,&sch);
-               idea_set_decrypt_key(&sch,&sch);
-               idea_set_decrypt_key(&sch,&sch);
-               }
-       d=Time_F(STOP);
-       printf("%ld idea idea_set_decrypt_key's in %.2f seconds\n",count,d);
-       aa=((double)COUNT(cca))/d;
-
-#ifdef SIGALRM
-       printf("Doing idea_encrypt's for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing idea_encrypt %ld times\n",cb);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cb); count+=4)
-               {
-               unsigned long data[2];
-
-               idea_encrypt(data,&sch);
-               idea_encrypt(data,&sch);
-               idea_encrypt(data,&sch);
-               idea_encrypt(data,&sch);
-               }
-       d=Time_F(STOP);
-       printf("%ld idea_encrypt's in %.2f second\n",count,d);
-       b=((double)COUNT(cb)*8)/d;
-
-#ifdef SIGALRM
-       printf("Doing idea_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-               BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing idea_cbc_encrypt %ld times on %ld byte blocks\n",cc,
-               BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cc); count++)
-               idea_cbc_encrypt(buf,buf,BUFSIZE,&sch,
-                       &(key[0]),IDEA_ENCRYPT);
-       d=Time_F(STOP);
-       printf("%ld idea_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       c=((double)COUNT(cc)*BUFSIZE)/d;
-
-       printf("IDEA set_encrypt_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a);
-       printf("IDEA set_decrypt_key per sec = %12.2f (%9.3fuS)\n",aa,1.0e6/aa);
-       printf("IDEA raw ecb bytes   per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b);
-       printf("IDEA cbc     bytes   per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c);
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }
-

diff --git a/crypto/md2/md2.c b/crypto/md2/md2.c
deleted file mode 100644 (file)
index f4d6f62..0000000
--- a/crypto/md2/md2.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* crypto/md2/md2.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 <openssl/md2.h>
-
-#define BUFSIZE        1024*16
-
-void do_fp(FILE *f);
-void pt(unsigned char *md);
-int read(int, void *, unsigned int);
-void exit(int);
-int main(int argc, char *argv[])
-       {
-       int i,err=0;
-       FILE *IN;
-
-       if (argc == 1)
-               {
-               do_fp(stdin);
-               }
-       else
-               {
-               for (i=1; i<argc; i++)
-                       {
-                       IN=fopen(argv[i],"r");
-                       if (IN == NULL)
-                               {
-                               perror(argv[i]);
-                               err++;
-                               continue;
-                               }
-                       printf("MD2(%s)= ",argv[i]);
-                       do_fp(IN);
-                       fclose(IN);
-                       }
-               }
-       exit(err);
-       return(err);
-       }
-
-void do_fp(FILE *f)
-       {
-       MD2_CTX c;
-       unsigned char md[MD2_DIGEST_LENGTH];
-       int fd,i;
-       static unsigned char buf[BUFSIZE];
-
-       fd=fileno(f);
-       MD2_Init(&c);
-       for (;;)
-               {
-               i=read(fd,buf,BUFSIZE);
-               if (i <= 0) break;
-               MD2_Update(&c,buf,(unsigned long)i);
-               }
-       MD2_Final(&(md[0]),&c);
-       pt(md);
-       }
-
-void pt(unsigned char *md)
-       {
-       int i;
-
-       for (i=0; i<MD2_DIGEST_LENGTH; i++)
-               printf("%02x",md[i]);
-       printf("\n");
-       }

diff --git a/crypto/md4/md4.c b/crypto/md4/md4.c
deleted file mode 100644 (file)
index 141415a..0000000
--- a/crypto/md4/md4.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* crypto/md4/md4.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 <openssl/md4.h>
-
-#define BUFSIZE        1024*16
-
-void do_fp(FILE *f);
-void pt(unsigned char *md);
-#if !defined(_OSD_POSIX) && !defined(__DJGPP__)
-int read(int, void *, unsigned int);
-#endif
-
-int main(int argc, char **argv)
-       {
-       int i,err=0;
-       FILE *IN;
-
-       if (argc == 1)
-               {
-               do_fp(stdin);
-               }
-       else
-               {
-               for (i=1; i<argc; i++)
-                       {
-                       IN=fopen(argv[i],"r");
-                       if (IN == NULL)
-                               {
-                               perror(argv[i]);
-                               err++;
-                               continue;
-                               }
-                       printf("MD4(%s)= ",argv[i]);
-                       do_fp(IN);
-                       fclose(IN);
-                       }
-               }
-       exit(err);
-       }
-
-void do_fp(FILE *f)
-       {
-       MD4_CTX c;
-       unsigned char md[MD4_DIGEST_LENGTH];
-       int fd;
-       int i;
-       static unsigned char buf[BUFSIZE];
-
-       fd=fileno(f);
-       MD4_Init(&c);
-       for (;;)
-               {
-               i=read(fd,buf,sizeof buf);
-               if (i <= 0) break;
-               MD4_Update(&c,buf,(unsigned long)i);
-               }
-       MD4_Final(&(md[0]),&c);
-       pt(md);
-       }
-
-void pt(unsigned char *md)
-       {
-       int i;
-
-       for (i=0; i<MD4_DIGEST_LENGTH; i++)
-               printf("%02x",md[i]);
-       printf("\n");
-       }
-

diff --git a/crypto/md5/md5.c b/crypto/md5/md5.c
deleted file mode 100644 (file)
index 563733a..0000000
--- a/crypto/md5/md5.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* crypto/md5/md5.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 <openssl/md5.h>
-
-#define BUFSIZE        1024*16
-
-void do_fp(FILE *f);
-void pt(unsigned char *md);
-#if !defined(_OSD_POSIX) && !defined(__DJGPP__)
-int read(int, void *, unsigned int);
-#endif
-
-int main(int argc, char **argv)
-       {
-       int i,err=0;
-       FILE *IN;
-
-       if (argc == 1)
-               {
-               do_fp(stdin);
-               }
-       else
-               {
-               for (i=1; i<argc; i++)
-                       {
-                       IN=fopen(argv[i],"r");
-                       if (IN == NULL)
-                               {
-                               perror(argv[i]);
-                               err++;
-                               continue;
-                               }
-                       printf("MD5(%s)= ",argv[i]);
-                       do_fp(IN);
-                       fclose(IN);
-                       }
-               }
-       exit(err);
-       }
-
-void do_fp(FILE *f)
-       {
-       MD5_CTX c;
-       unsigned char md[MD5_DIGEST_LENGTH];
-       int fd;
-       int i;
-       static unsigned char buf[BUFSIZE];
-
-       fd=fileno(f);
-       MD5_Init(&c);
-       for (;;)
-               {
-               i=read(fd,buf,BUFSIZE);
-               if (i <= 0) break;
-               MD5_Update(&c,buf,(unsigned long)i);
-               }
-       MD5_Final(&(md[0]),&c);
-       pt(md);
-       }
-
-void pt(unsigned char *md)
-       {
-       int i;
-
-       for (i=0; i<MD5_DIGEST_LENGTH; i++)
-               printf("%02x",md[i]);
-       printf("\n");
-       }
-

diff --git a/crypto/rc2/rc2speed.c b/crypto/rc2/rc2speed.c
deleted file mode 100644 (file)
index 85cf6f6..0000000
--- a/crypto/rc2/rc2speed.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* crypto/rc2/rc2speed.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.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/rc2.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-#ifndef CLK_TCK
-#define HZ     100.0
-#else  /* CLK_TCK */
-#define HZ ((double)CLK_TCK)
-#endif /* CLK_TCK */
-#endif /* HZ */
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static unsigned char key[] ={
-                       0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                       0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-                       };
-       RC2_KEY sch;
-       double a,b,c,d;
-#ifndef SIGALRM
-       long ca,cb,cc;
-#endif
-
-#ifndef TIMES
-       printf("To get the most accurate results, try to run this\n");
-       printf("program when this computer is idle.\n");
-#endif
-
-#ifndef SIGALRM
-       printf("First we calculate the approximate speed ...\n");
-       RC2_set_key(&sch,16,key,128);
-       count=10;
-       do      {
-               long i;
-               unsigned long data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       RC2_encrypt(data,&sch);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count/512;
-       cb=count;
-       cc=count*8/BUFSIZE+1;
-       printf("Doing RC2_set_key %ld times\n",ca);
-#define COND(d)        (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)        (run)
-#define COUNT(d) (count)
-       signal(SIGALRM,sig_done);
-       printf("Doing RC2_set_key for 10 seconds\n");
-       alarm(10);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(ca); count+=4)
-               {
-               RC2_set_key(&sch,16,key,128);
-               RC2_set_key(&sch,16,key,128);
-               RC2_set_key(&sch,16,key,128);
-               RC2_set_key(&sch,16,key,128);
-               }
-       d=Time_F(STOP);
-       printf("%ld RC2_set_key's in %.2f seconds\n",count,d);
-       a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-       printf("Doing RC2_encrypt's for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing RC2_encrypt %ld times\n",cb);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cb); count+=4)
-               {
-               unsigned long data[2];
-
-               RC2_encrypt(data,&sch);
-               RC2_encrypt(data,&sch);
-               RC2_encrypt(data,&sch);
-               RC2_encrypt(data,&sch);
-               }
-       d=Time_F(STOP);
-       printf("%ld RC2_encrypt's in %.2f second\n",count,d);
-       b=((double)COUNT(cb)*8)/d;
-
-#ifdef SIGALRM
-       printf("Doing RC2_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-               BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing RC2_cbc_encrypt %ld times on %ld byte blocks\n",cc,
-               BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cc); count++)
-               RC2_cbc_encrypt(buf,buf,BUFSIZE,&sch,
-                       &(key[0]),RC2_ENCRYPT);
-       d=Time_F(STOP);
-       printf("%ld RC2_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       c=((double)COUNT(cc)*BUFSIZE)/d;
-
-       printf("RC2 set_key       per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a);
-       printf("RC2 raw ecb bytes per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b);
-       printf("RC2 cbc     bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c);
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }

diff --git a/crypto/rc4/rc4speed.c b/crypto/rc4/rc4speed.c
deleted file mode 100644 (file)
index 0ebd381..0000000
--- a/crypto/rc4/rc4speed.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* crypto/rc4/rc4speed.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.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/rc4.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-#ifndef CLK_TCK
-#define HZ     100.0
-#else /* CLK_TCK */
-#define HZ ((double)CLK_TCK)
-#endif
-#endif
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static unsigned char key[] ={
-                       0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                       0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-                       };
-       RC4_KEY sch;
-       double a,b,c,d;
-#ifndef SIGALRM
-       long ca,cb,cc;
-#endif
-
-#ifndef TIMES
-       printf("To get the most accurate results, try to run this\n");
-       printf("program when this computer is idle.\n");
-#endif
-
-#ifndef SIGALRM
-       printf("First we calculate the approximate speed ...\n");
-       RC4_set_key(&sch,16,key);
-       count=10;
-       do      {
-               long i;
-               unsigned long data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       RC4(&sch,8,buf,buf);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count/512;
-       cc=count*8/BUFSIZE+1;
-       printf("Doing RC4_set_key %ld times\n",ca);
-#define COND(d)        (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)        (run)
-#define COUNT(d) (count)
-       signal(SIGALRM,sig_done);
-       printf("Doing RC4_set_key for 10 seconds\n");
-       alarm(10);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(ca); count+=4)
-               {
-               RC4_set_key(&sch,16,key);
-               RC4_set_key(&sch,16,key);
-               RC4_set_key(&sch,16,key);
-               RC4_set_key(&sch,16,key);
-               }
-       d=Time_F(STOP);
-       printf("%ld RC4_set_key's in %.2f seconds\n",count,d);
-       a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-       printf("Doing RC4 on %ld byte blocks for 10 seconds\n",BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing RC4 %ld times on %ld byte blocks\n",cc,BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cc); count++)
-               RC4(&sch,BUFSIZE,buf,buf);
-       d=Time_F(STOP);
-       printf("%ld RC4's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       c=((double)COUNT(cc)*BUFSIZE)/d;
-
-       printf("RC4 set_key per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a);
-       printf("RC4   bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c);
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }
-

diff --git a/crypto/rc5/rc5speed.c b/crypto/rc5/rc5speed.c
deleted file mode 100644 (file)
index 8e363be..0000000
--- a/crypto/rc5/rc5speed.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* crypto/rc5/rc5speed.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.]
- */
-
-/* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
-/* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
-
-#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
-#define TIMES
-#endif
-
-#include <stdio.h>
-
-#include <openssl/e_os2.h>
-#include OPENSSL_UNISTD_IO
-OPENSSL_DECLARE_EXIT
-
-#ifndef OPENSSL_SYS_NETWARE
-#include <signal.h>
-#endif
-
-#ifndef _IRIX
-#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
-
-#ifndef TIMES
-#include <sys/timeb.h>
-#endif
-
-#if defined(sun) || defined(__ultrix)
-#define _POSIX_SOURCE
-#include <limits.h>
-#include <sys/param.h>
-#endif
-
-#include <openssl/rc5.h>
-
-/* The following if from times(3) man page.  It may need to be changed */
-#ifndef HZ
-#ifndef CLK_TCK
-#define HZ     100.0
-#else /* CLK_TCK */
-#define HZ ((double)CLK_TCK)
-#endif
-#endif
-
-#define BUFSIZE        ((long)1024)
-long run=0;
-
-double Time_F(int s);
-#ifdef SIGALRM
-#if defined(__STDC__) || defined(sgi) || defined(_AIX)
-#define SIGRETTYPE void
-#else
-#define SIGRETTYPE int
-#endif
-
-SIGRETTYPE sig_done(int sig);
-SIGRETTYPE sig_done(int sig)
-       {
-       signal(SIGALRM,sig_done);
-       run=0;
-#ifdef LINT
-       sig=sig;
-#endif
-       }
-#endif
-
-#define START  0
-#define STOP   1
-
-double Time_F(int s)
-       {
-       double ret;
-#ifdef TIMES
-       static struct tms tstart,tend;
-
-       if (s == START)
-               {
-               times(&tstart);
-               return(0);
-               }
-       else
-               {
-               times(&tend);
-               ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#else /* !times() */
-       static struct timeb tstart,tend;
-       long i;
-
-       if (s == START)
-               {
-               ftime(&tstart);
-               return(0);
-               }
-       else
-               {
-               ftime(&tend);
-               i=(long)tend.millitm-(long)tstart.millitm;
-               ret=((double)(tend.time-tstart.time))+((double)i)/1e3;
-               return((ret == 0.0)?1e-6:ret);
-               }
-#endif
-       }
-
-int main(int argc, char **argv)
-       {
-       long count;
-       static unsigned char buf[BUFSIZE];
-       static unsigned char key[] ={
-                       0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
-                       0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-                       };
-       RC5_32_KEY sch;
-       double a,b,c,d;
-#ifndef SIGALRM
-       long ca,cb,cc;
-#endif
-
-#ifndef TIMES
-       printf("To get the most accurate results, try to run this\n");
-       printf("program when this computer is idle.\n");
-#endif
-
-#ifndef SIGALRM
-       printf("First we calculate the approximate speed ...\n");
-       RC5_32_set_key(&sch,16,key,12);
-       count=10;
-       do      {
-               long i;
-               unsigned long data[2];
-
-               count*=2;
-               Time_F(START);
-               for (i=count; i; i--)
-                       RC5_32_encrypt(data,&sch);
-               d=Time_F(STOP);
-               } while (d < 3.0);
-       ca=count/512;
-       cb=count;
-       cc=count*8/BUFSIZE+1;
-       printf("Doing RC5_32_set_key %ld times\n",ca);
-#define COND(d)        (count != (d))
-#define COUNT(d) (d)
-#else
-#define COND(c)        (run)
-#define COUNT(d) (count)
-       signal(SIGALRM,sig_done);
-       printf("Doing RC5_32_set_key for 10 seconds\n");
-       alarm(10);
-#endif
-
-       Time_F(START);
-       for (count=0,run=1; COND(ca); count+=4)
-               {
-               RC5_32_set_key(&sch,16,key,12);
-               RC5_32_set_key(&sch,16,key,12);
-               RC5_32_set_key(&sch,16,key,12);
-               RC5_32_set_key(&sch,16,key,12);
-               }
-       d=Time_F(STOP);
-       printf("%ld RC5_32_set_key's in %.2f seconds\n",count,d);
-       a=((double)COUNT(ca))/d;
-
-#ifdef SIGALRM
-       printf("Doing RC5_32_encrypt's for 10 seconds\n");
-       alarm(10);
-#else
-       printf("Doing RC5_32_encrypt %ld times\n",cb);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cb); count+=4)
-               {
-               unsigned long data[2];
-
-               RC5_32_encrypt(data,&sch);
-               RC5_32_encrypt(data,&sch);
-               RC5_32_encrypt(data,&sch);
-               RC5_32_encrypt(data,&sch);
-               }
-       d=Time_F(STOP);
-       printf("%ld RC5_32_encrypt's in %.2f second\n",count,d);
-       b=((double)COUNT(cb)*8)/d;
-
-#ifdef SIGALRM
-       printf("Doing RC5_32_cbc_encrypt on %ld byte blocks for 10 seconds\n",
-               BUFSIZE);
-       alarm(10);
-#else
-       printf("Doing RC5_32_cbc_encrypt %ld times on %ld byte blocks\n",cc,
-               BUFSIZE);
-#endif
-       Time_F(START);
-       for (count=0,run=1; COND(cc); count++)
-               RC5_32_cbc_encrypt(buf,buf,BUFSIZE,&sch,
-                       &(key[0]),RC5_ENCRYPT);
-       d=Time_F(STOP);
-       printf("%ld RC5_32_cbc_encrypt's of %ld byte blocks in %.2f second\n",
-               count,BUFSIZE,d);
-       c=((double)COUNT(cc)*BUFSIZE)/d;
-
-       printf("RC5_32/12/16 set_key       per sec = %12.2f (%9.3fuS)\n",a,1.0e6/a);
-       printf("RC5_32/12/16 raw ecb bytes per sec = %12.2f (%9.3fuS)\n",b,8.0e6/b);
-       printf("RC5_32/12/16 cbc     bytes per sec = %12.2f (%9.3fuS)\n",c,8.0e6/c);
-       exit(0);
-#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
-       return(0);
-#endif
-       }

diff --git a/crypto/ripemd/rmd160.c b/crypto/ripemd/rmd160.c
deleted file mode 100644 (file)
index b0ec574..0000000
--- a/crypto/ripemd/rmd160.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* crypto/ripemd/rmd160.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 <openssl/ripemd.h>
-
-#define BUFSIZE        1024*16
-
-void do_fp(FILE *f);
-void pt(unsigned char *md);
-#if !defined(_OSD_POSIX) && !defined(__DJGPP__)
-int read(int, void *, unsigned int);
-#endif
-
-int main(int argc, char **argv)
-       {
-       int i,err=0;
-       FILE *IN;
-
-       if (argc == 1)
-               {
-               do_fp(stdin);
-               }
-       else
-               {
-               for (i=1; i<argc; i++)
-                       {
-                       IN=fopen(argv[i],"r");
-                       if (IN == NULL)
-                               {
-                               perror(argv[i]);
-                               err++;
-                               continue;
-                               }
-                       printf("RIPEMD160(%s)= ",argv[i]);
-                       do_fp(IN);
-                       fclose(IN);
-                       }
-               }
-       exit(err);
-       }
-
-void do_fp(FILE *f)
-       {
-       RIPEMD160_CTX c;
-       unsigned char md[RIPEMD160_DIGEST_LENGTH];
-       int fd;
-       int i;
-       static unsigned char buf[BUFSIZE];
-
-       fd=fileno(f);
-       RIPEMD160_Init(&c);
-       for (;;)
-               {
-               i=read(fd,buf,BUFSIZE);
-               if (i <= 0) break;
-               RIPEMD160_Update(&c,buf,(unsigned long)i);
-               }
-       RIPEMD160_Final(&(md[0]),&c);
-       pt(md);
-       }
-
-void pt(unsigned char *md)
-       {
-       int i;
-
-       for (i=0; i<RIPEMD160_DIGEST_LENGTH; i++)
-               printf("%02x",md[i]);
-       printf("\n");
-       }
-

diff --git a/crypto/sha/sha.c b/crypto/sha/sha.c
deleted file mode 100644 (file)
index 4212655..0000000
--- a/crypto/sha/sha.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* crypto/sha/sha.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 <openssl/sha.h>
-
-#define BUFSIZE        1024*16
-
-void do_fp(FILE *f);
-void pt(unsigned char *md);
-int read(int, void *, unsigned int);
-int main(int argc, char **argv)
-       {
-       int i,err=0;
-       FILE *IN;
-
-       if (argc == 1)
-               {
-               do_fp(stdin);
-               }
-       else
-               {
-               for (i=1; i<argc; i++)
-                       {
-                       IN=fopen(argv[i],"r");
-                       if (IN == NULL)
-                               {
-                               perror(argv[i]);
-                               err++;
-                               continue;
-                               }
-                       printf("SHA(%s)= ",argv[i]);
-                       do_fp(IN);
-                       fclose(IN);
-                       }
-               }
-       exit(err);
-       }
-
-void do_fp(FILE *f)
-       {
-       SHA_CTX c;
-       unsigned char md[SHA_DIGEST_LENGTH];
-       int fd;
-       int i;
-       unsigned char buf[BUFSIZE];
-
-       fd=fileno(f);
-       SHA_Init(&c);
-       for (;;)
-               {
-               i=read(fd,buf,BUFSIZE);
-               if (i <= 0) break;
-               SHA_Update(&c,buf,(unsigned long)i);
-               }
-       SHA_Final(&(md[0]),&c);
-       pt(md);
-       }
-
-void pt(unsigned char *md)
-       {
-       int i;
-
-       for (i=0; i<SHA_DIGEST_LENGTH; i++)
-               printf("%02x",md[i]);
-       printf("\n");
-       }
-

diff --git a/crypto/sha/sha1.c b/crypto/sha/sha1.c
deleted file mode 100644 (file)
index d350c88..0000000
--- a/crypto/sha/sha1.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* crypto/sha/sha1.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 <openssl/sha.h>
-
-#define BUFSIZE        1024*16
-
-void do_fp(FILE *f);
-void pt(unsigned char *md);
-#ifndef _OSD_POSIX
-int read(int, void *, unsigned int);
-#endif
-
-int main(int argc, char **argv)
-       {
-       int i,err=0;
-       FILE *IN;
-
-       if (argc == 1)
-               {
-               do_fp(stdin);
-               }
-       else
-               {
-               for (i=1; i<argc; i++)
-                       {
-                       IN=fopen(argv[i],"r");
-                       if (IN == NULL)
-                               {
-                               perror(argv[i]);
-                               err++;
-                               continue;
-                               }
-                       printf("SHA1(%s)= ",argv[i]);
-                       do_fp(IN);
-                       fclose(IN);
-                       }
-               }
-       exit(err);
-       }
-
-void do_fp(FILE *f)
-       {
-       SHA_CTX c;
-       unsigned char md[SHA_DIGEST_LENGTH];
-       int fd;
-       int i;
-       unsigned char buf[BUFSIZE];
-
-       fd=fileno(f);
-       SHA1_Init(&c);
-       for (;;)
-               {
-               i=read(fd,buf,BUFSIZE);
-               if (i <= 0) break;
-               SHA1_Update(&c,buf,(unsigned long)i);
-               }
-       SHA1_Final(&(md[0]),&c);
-       pt(md);
-       }
-
-void pt(unsigned char *md)
-       {
-       int i;
-
-       for (i=0; i<SHA_DIGEST_LENGTH; i++)
-               printf("%02x",md[i]);
-       printf("\n");
-       }
-