Some more source tree cleanups (removed obsolete files crypto/bf/asm/bf586.pl,
test/test.txt and crypto/sha/asm/f.s; changed permission on "config" script to be executable) and a fix for the INSTALL document. Submitted by: Ulf Moeller <ulf@fitug.de> Reviewed by: Ralf S. Engelschall
This commit is contained in:
Ralf S. Engelschall
parent
e2e044faa1
commit
afb2306346
6
CHANGES
6
CHANGES
@ -5,6 +5,12 @@
|
|||||||
|
|
||||||
Changes between 0.9.1c and 0.9.2
|
Changes between 0.9.1c and 0.9.2
|
||||||
|
|
||||||
|
*) Some more source tree cleanups (removed obsolete files
|
||||||
|
crypto/bf/asm/bf586.pl, test/test.txt and crypto/sha/asm/f.s; changed
|
||||||
|
permission on "config" script to be executable) and a fix for the INSTALL
|
||||||
|
document.
|
||||||
|
[Ulf Moeller <ulf@fitug.de>]
|
||||||
|
|
||||||
*) Remove some legacy and erroneous uses of malloc, free instead of
|
*) Remove some legacy and erroneous uses of malloc, free instead of
|
||||||
Malloc, Free.
|
Malloc, Free.
|
||||||
[Lennart Bang <lob@netstream.se>, with minor changes by Steve]
|
[Lennart Bang <lob@netstream.se>, with minor changes by Steve]
|
||||||
|
|||||||
5
INSTALL
5
INSTALL
@ -1,8 +1,7 @@
|
|||||||
Installing OpenSSL on Unix
|
Installing OpenSSL on Unix
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
||||||
[For instructions for compiling OpenSSL on Windows systems, see
|
[For instructions for compiling OpenSSL on Windows systems, see INSTALL.W32].
|
||||||
INSTALL.W32].
|
|
||||||
|
|
||||||
To install OpenSSL, you will need:
|
To install OpenSSL, you will need:
|
||||||
|
|
||||||
@ -23,7 +22,7 @@ If you want to just get on with it, do:
|
|||||||
|
|
||||||
This will build and install OpenSSL in the default location, which is
|
This will build and install OpenSSL in the default location, which is
|
||||||
/usr/local/ssl. If you want to install it anywhere else, do this
|
/usr/local/ssl. If you want to install it anywhere else, do this
|
||||||
after running ./Configure <system>:
|
after running `sh config':
|
||||||
|
|
||||||
perl util/ssldir.pl /new/install/path
|
perl util/ssldir.pl /new/install/path
|
||||||
|
|
||||||
|
|||||||
@ -1,159 +0,0 @@
|
|||||||
#!/usr/local/bin/perl
|
|
||||||
#!/usr/local/bin/perl
|
|
||||||
|
|
||||||
$prog="bf586.pl";
|
|
||||||
|
|
||||||
# base code is in microsft
|
|
||||||
# op dest, source
|
|
||||||
# format.
|
|
||||||
#
|
|
||||||
|
|
||||||
if ( ($ARGV[0] eq "elf"))
|
|
||||||
{ require "x86unix.pl"; }
|
|
||||||
elsif ( ($ARGV[0] eq "a.out"))
|
|
||||||
{ $aout=1; require "x86unix.pl"; }
|
|
||||||
elsif ( ($ARGV[0] eq "sol"))
|
|
||||||
{ $sol=1; require "x86unix.pl"; }
|
|
||||||
elsif ( ($ARGV[0] eq "cpp"))
|
|
||||||
{ $cpp=1; require "x86unix.pl"; }
|
|
||||||
elsif ( ($ARGV[0] eq "win32"))
|
|
||||||
{ require "x86ms.pl"; }
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print STDERR <<"EOF";
|
|
||||||
Pick one target type from
|
|
||||||
elf - linux, FreeBSD etc
|
|
||||||
a.out - old linux
|
|
||||||
sol - x86 solaris
|
|
||||||
cpp - format so x86unix.cpp can be used
|
|
||||||
win32 - Windows 95/Windows NT
|
|
||||||
EOF
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
&comment("Don't even think of reading this code");
|
|
||||||
&comment("It was automatically generated by $prog");
|
|
||||||
&comment("Which is a perl program used to generate the x86 assember for");
|
|
||||||
&comment("any of elf, a.out, Win32, or Solaris");
|
|
||||||
&comment("It can be found in SSLeay 0.7.0+");
|
|
||||||
&comment("eric <eay\@cryptsoft.com>");
|
|
||||||
&comment("");
|
|
||||||
|
|
||||||
&file("bfx86xxxx");
|
|
||||||
|
|
||||||
$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");
|
|
||||||
|
|
||||||
&file_end();
|
|
||||||
|
|
||||||
sub des_encrypt
|
|
||||||
{
|
|
||||||
local($name)=@_;
|
|
||||||
|
|
||||||
&function_begin($name,3,"");
|
|
||||||
|
|
||||||
&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
|
|
||||||
|
|
||||||
&mov("ebp",&wparam(2)); # get encrypt flag
|
|
||||||
&cmp("ebp","0");
|
|
||||||
&je(&label("start_decrypt"));
|
|
||||||
|
|
||||||
&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);
|
|
||||||
|
|
||||||
&set_label("start_decrypt");
|
|
||||||
|
|
||||||
&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]);
|
|
||||||
}
|
|
||||||
|
|
||||||
1905
crypto/sha/asm/f.s
1905
crypto/sha/asm/f.s
File diff suppressed because it is too large
Load Diff
@ -1,31 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
test=./test.txt
|
|
||||||
|
|
||||||
cat $0 >$test;
|
|
||||||
|
|
||||||
for i in rc4 des-cfb des-ofb des-ecb des-cbc des-ede des-ede3 \
|
|
||||||
des-cbc-ede des-cbc-ede3 idea-ecb idea-cfb idea-ofb idea-cbc
|
|
||||||
do
|
|
||||||
echo $i
|
|
||||||
../apps/ssleay $i -e -k test < $test > $test.$i.cipher
|
|
||||||
../apps/ssleay $i -d -k test < $test.$i.cipher >$test.$i.clear
|
|
||||||
cmp $test $test.$i.clear
|
|
||||||
if [ $? != 0 ]
|
|
||||||
then
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
/bin/rm $test.$i.cipher $test.$i.clear
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo $i base64
|
|
||||||
../apps/ssleay $i -a -e -k test < $test > $test.$i.cipher
|
|
||||||
../apps/ssleay $i -a -d -k test < $test.$i.cipher >$test.$i.clear
|
|
||||||
cmp $test $test.$i.clear
|
|
||||||
if [ $? != 0 ]
|
|
||||||
then
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
/bin/rm $test.$i.cipher $test.$i.clear
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
Loading…
x
Reference in New Issue
Block a user