Remove now unused files.
authorjsing <jsing@openbsd.org>
Wed, 27 Mar 2024 11:12:46 +0000 (11:12 +0000)
committerjsing <jsing@openbsd.org>
Wed, 27 Mar 2024 11:12:46 +0000 (11:12 +0000)
lib/libcrypto/bf/asm/bf-586.pl [deleted file]
lib/libcrypto/bf/bf_cbc.c [deleted file]

diff --git a/lib/libcrypto/bf/asm/bf-586.pl b/lib/libcrypto/bf/asm/bf-586.pl
deleted file mode 100644 (file)
index 1f9b345..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/local/bin/perl
-
-$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
-push(@INC,"${dir}","${dir}../../perlasm");
-require "x86asm.pl";
-require "cbc.pl";
-
-&asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386");
-
-$BF_ROUNDS=16;
-$BF_OFF=($BF_ROUNDS+2)*4;
-$L="edi";
-$R="esi";
-$P="ebp";
-$tmp1="eax";
-$tmp2="ebx";
-$tmp3="ecx";
-$tmp4="edx";
-
-&BF_encrypt("BF_encrypt",1);
-&BF_encrypt("BF_decrypt",0);
-&cbc("BF_cbc_encrypt","BF_encrypt","BF_decrypt",1,4,5,3,-1,-1) unless $main'openbsd;
-&asm_finish();
-
-sub BF_encrypt
-       {
-       local($name,$enc)=@_;
-
-       &function_begin_B($name,"");
-
-       &comment("");
-
-       &push("ebp");
-       &push("ebx");
-       &mov($tmp2,&wparam(0));
-       &mov($P,&wparam(1));
-       &push("esi");
-       &push("edi");
-
-       &comment("Load the 2 words");
-       &mov($L,&DWP(0,$tmp2,"",0));
-       &mov($R,&DWP(4,$tmp2,"",0));
-
-       &xor(   $tmp1,  $tmp1);
-
-       # encrypting part
-
-       if ($enc)
-               {
-                &mov($tmp2,&DWP(0,$P,"",0));
-               &xor(   $tmp3,  $tmp3);
-
-               &xor($L,$tmp2);
-               for ($i=0; $i<$BF_ROUNDS; $i+=2)
-                       {
-                       &comment("");
-                       &comment("Round $i");
-                       &BF_ENCRYPT($i+1,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,1);
-
-                       &comment("");
-                       &comment("Round ".sprintf("%d",$i+1));
-                       &BF_ENCRYPT($i+2,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,1);
-                       }
-               # &mov($tmp1,&wparam(0)); In last loop
-               &mov($tmp4,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
-               }
-       else
-               {
-                &mov($tmp2,&DWP(($BF_ROUNDS+1)*4,$P,"",0));
-               &xor(   $tmp3,  $tmp3);
-
-               &xor($L,$tmp2);
-               for ($i=$BF_ROUNDS; $i>0; $i-=2)
-                       {
-                       &comment("");
-                       &comment("Round $i");
-                       &BF_ENCRYPT($i,$R,$L,$P,$tmp1,$tmp2,$tmp3,$tmp4,0);
-                       &comment("");
-                       &comment("Round ".sprintf("%d",$i-1));
-                       &BF_ENCRYPT($i-1,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,0);
-                       }
-               # &mov($tmp1,&wparam(0)); In last loop
-               &mov($tmp4,&DWP(0,$P,"",0));
-               }
-
-       &xor($R,$tmp4);
-       &mov(&DWP(4,$tmp1,"",0),$L);
-
-       &mov(&DWP(0,$tmp1,"",0),$R);
-       &function_end($name);
-       }
-
-sub BF_ENCRYPT
-       {
-       local($i,$L,$R,$P,$tmp1,$tmp2,$tmp3,$tmp4,$enc)=@_;
-
-       &mov(   $tmp4,          &DWP(&n2a($i*4),$P,"",0)); # for next round
-
-       &mov(   $tmp2,          $R);
-       &xor(   $L,             $tmp4);
-
-       &shr(   $tmp2,          16);
-       &mov(   $tmp4,          $R);
-
-       &movb(  &LB($tmp1),     &HB($tmp2));    # A
-       &and(   $tmp2,          0xff);          # B
-
-       &movb(  &LB($tmp3),     &HB($tmp4));    # C
-       &and(   $tmp4,          0xff);          # D
-
-       &mov(   $tmp1,          &DWP(&n2a($BF_OFF+0x0000),$P,$tmp1,4));
-       &mov(   $tmp2,          &DWP(&n2a($BF_OFF+0x0400),$P,$tmp2,4));
-
-       &add(   $tmp2,          $tmp1);
-       &mov(   $tmp1,          &DWP(&n2a($BF_OFF+0x0800),$P,$tmp3,4));
-
-       &xor(   $tmp2,          $tmp1);
-       &mov(   $tmp4,          &DWP(&n2a($BF_OFF+0x0C00),$P,$tmp4,4));
-
-       &add(   $tmp2,          $tmp4);
-       if (($enc && ($i != 16)) || ((!$enc) && ($i != 1)))
-               { &xor( $tmp1,          $tmp1); }
-       else
-               {
-               &comment("Load parameter 0 ($i) enc=$enc");
-               &mov($tmp1,&wparam(0));
-               } # In last loop
-
-       &xor(   $L,             $tmp2);
-       # delay
-       }
-
-sub n2a
-       {
-       sprintf("%d",$_[0]);
-       }
-
diff --git a/lib/libcrypto/bf/bf_cbc.c b/lib/libcrypto/bf/bf_cbc.c
deleted file mode 100644 (file)
index 044bd19..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-/* $OpenBSD: bf_cbc.c,v 1.8 2022/11/26 16:08:51 tb Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <openssl/blowfish.h>
-
-#include "bf_local.h"
-
-void
-BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-    const BF_KEY *schedule, unsigned char *ivec, int encrypt)
-{
-       BF_LONG tin0, tin1;
-       BF_LONG tout0, tout1, xor0, xor1;
-       long l = length;
-       BF_LONG tin[2];
-
-       if (encrypt) {
-               n2l(ivec, tout0);
-               n2l(ivec, tout1);
-               ivec -= 8;
-               for (l -= 8; l >= 0; l -= 8) {
-                       n2l(in, tin0);
-                       n2l(in, tin1);
-                       tin0 ^= tout0;
-                       tin1 ^= tout1;
-                       tin[0] = tin0;
-                       tin[1] = tin1;
-                       BF_encrypt(tin, schedule);
-                       tout0 = tin[0];
-                       tout1 = tin[1];
-                       l2n(tout0, out);
-                       l2n(tout1, out);
-               }
-               if (l != -8) {
-                       n2ln(in, tin0, tin1, l + 8);
-                       tin0 ^= tout0;
-                       tin1 ^= tout1;
-                       tin[0] = tin0;
-                       tin[1] = tin1;
-                       BF_encrypt(tin, schedule);
-                       tout0 = tin[0];
-                       tout1 = tin[1];
-                       l2n(tout0, out);
-                       l2n(tout1, out);
-               }
-               l2n(tout0, ivec);
-               l2n(tout1, ivec);
-       } else {
-               n2l(ivec, xor0);
-               n2l(ivec, xor1);
-               ivec -= 8;
-               for (l -= 8; l >= 0; l -= 8) {
-                       n2l(in, tin0);
-                       n2l(in, tin1);
-                       tin[0] = tin0;
-                       tin[1] = tin1;
-                       BF_decrypt(tin, schedule);
-                       tout0 = tin[0]^xor0;
-                       tout1 = tin[1]^xor1;
-                       l2n(tout0, out);
-                       l2n(tout1, out);
-                       xor0 = tin0;
-                       xor1 = tin1;
-               }
-               if (l != -8) {
-                       n2l(in, tin0);
-                       n2l(in, tin1);
-                       tin[0] = tin0;
-                       tin[1] = tin1;
-                       BF_decrypt(tin, schedule);
-                       tout0 = tin[0]^xor0;
-                       tout1 = tin[1]^xor1;
-                       l2nn(tout0, tout1, out, l + 8);
-                       xor0 = tin0;
-                       xor1 = tin1;
-               }
-               l2n(xor0, ivec);
-               l2n(xor1, ivec);
-       }
-       tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
-       tin[0] = tin[1] = 0;
-}