Remove old DES API
Includes VMS fixes from Richard. Includes Kurt's destest fixes (RT 1290). Closes tickets 1290 and 1291 Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz
parent
fd22ab9edf
commit
24956ca00f
41 changed files with 95 additions and 4295 deletions
3
CHANGES
3
CHANGES
|
|
@ -31,6 +31,9 @@
|
|||
done while fixing the error code for the key-too-small case.
|
||||
[Annie Yousar <a.yousar@informatik.hu-berlin.de>]
|
||||
|
||||
*) Removed old DES API.
|
||||
[Rich Salz]
|
||||
|
||||
*) Remove various unsupported platforms:
|
||||
Sony NEWS4
|
||||
BEOS and BEOS_R5
|
||||
|
|
|
|||
|
|
@ -593,7 +593,7 @@ openssl.o: openssl.c progs.h s_apps.h
|
|||
passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
|
||||
passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h
|
||||
passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h
|
||||
passwd.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
|
||||
passwd.o: ../include/openssl/e_os2.h
|
||||
passwd.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
|
||||
passwd.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
|
||||
passwd.o: ../include/openssl/err.h ../include/openssl/evp.h
|
||||
|
|
@ -936,7 +936,7 @@ speed.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
|
|||
speed.o: ../include/openssl/bn.h ../include/openssl/buffer.h
|
||||
speed.o: ../include/openssl/camellia.h ../include/openssl/cast.h
|
||||
speed.o: ../include/openssl/conf.h ../include/openssl/crypto.h
|
||||
speed.o: ../include/openssl/des.h ../include/openssl/des_old.h
|
||||
speed.o: ../include/openssl/des.h
|
||||
speed.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
|
||||
speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
|
||||
speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
|
||||
|
|
@ -1026,7 +1026,7 @@ version.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
|
|||
version.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
|
||||
version.o: ../include/openssl/buffer.h ../include/openssl/conf.h
|
||||
version.o: ../include/openssl/crypto.h ../include/openssl/des.h
|
||||
version.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
|
||||
version.o: ../include/openssl/e_os2.h
|
||||
version.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
|
||||
version.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
|
||||
version.o: ../include/openssl/evp.h ../include/openssl/idea.h
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -
|
|||
"ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ -
|
||||
"des_enc,fcrypt_b,"+ -
|
||||
"fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -
|
||||
"des_old,des_old2,read2pwd"
|
||||
"read2pwd"
|
||||
$ LIB_AES = "aes_misc,aes_ecb,aes_cfb,aes_ofb,aes_ige,aes_wrap,"+ -
|
||||
"aes_core,aes_cbc"
|
||||
$ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
package DES;
|
||||
|
||||
require Exporter;
|
||||
require DynaLoader;
|
||||
@ISA = qw(Exporter DynaLoader);
|
||||
# Items to export into callers namespace by default
|
||||
# (move infrequently used names to @EXPORT_OK below)
|
||||
@EXPORT = qw(
|
||||
);
|
||||
# Other items we are prepared to export if requested
|
||||
@EXPORT_OK = qw(
|
||||
crypt
|
||||
);
|
||||
|
||||
# Preloaded methods go here. Autoload methods go after __END__, and are
|
||||
# processed by the autosplit program.
|
||||
bootstrap DES;
|
||||
1;
|
||||
__END__
|
||||
|
|
@ -1,268 +0,0 @@
|
|||
#include "EXTERN.h"
|
||||
#include "perl.h"
|
||||
#include "XSUB.h"
|
||||
#include "des.h"
|
||||
|
||||
#define deschar char
|
||||
static STRLEN len;
|
||||
|
||||
static int
|
||||
not_here(s)
|
||||
char *s;
|
||||
{
|
||||
croak("%s not implemented on this architecture", s);
|
||||
return -1;
|
||||
}
|
||||
|
||||
MODULE = DES PACKAGE = DES PREFIX = des_
|
||||
|
||||
char *
|
||||
des_crypt(buf,salt)
|
||||
char * buf
|
||||
char * salt
|
||||
|
||||
void
|
||||
des_set_odd_parity(key)
|
||||
des_cblock * key
|
||||
PPCODE:
|
||||
{
|
||||
SV *s;
|
||||
|
||||
s=sv_newmortal();
|
||||
sv_setpvn(s,(char *)key,8);
|
||||
des_set_odd_parity((des_cblock *)SvPV(s,na));
|
||||
PUSHs(s);
|
||||
}
|
||||
|
||||
int
|
||||
des_is_weak_key(key)
|
||||
des_cblock * key
|
||||
|
||||
des_key_schedule
|
||||
des_set_key(key)
|
||||
des_cblock * key
|
||||
CODE:
|
||||
des_set_key(key,RETVAL);
|
||||
OUTPUT:
|
||||
RETVAL
|
||||
|
||||
des_cblock
|
||||
des_ecb_encrypt(input,ks,encrypt)
|
||||
des_cblock * input
|
||||
des_key_schedule * ks
|
||||
int encrypt
|
||||
CODE:
|
||||
des_ecb_encrypt(input,&RETVAL,*ks,encrypt);
|
||||
OUTPUT:
|
||||
RETVAL
|
||||
|
||||
void
|
||||
des_cbc_encrypt(input,ks,ivec,encrypt)
|
||||
char * input
|
||||
des_key_schedule * ks
|
||||
des_cblock * ivec
|
||||
int encrypt
|
||||
PPCODE:
|
||||
{
|
||||
SV *s;
|
||||
STRLEN len,l;
|
||||
char *c;
|
||||
|
||||
l=SvCUR(ST(0));
|
||||
len=((((unsigned long)l)+7)/8)*8;
|
||||
s=sv_newmortal();
|
||||
sv_setpvn(s,"",0);
|
||||
SvGROW(s,len);
|
||||
SvCUR_set(s,len);
|
||||
c=(char *)SvPV(s,na);
|
||||
des_cbc_encrypt((des_cblock *)input,(des_cblock *)c,
|
||||
l,*ks,ivec,encrypt);
|
||||
sv_setpvn(ST(2),(char *)c[len-8],8);
|
||||
PUSHs(s);
|
||||
}
|
||||
|
||||
void
|
||||
des_cbc3_encrypt(input,ks1,ks2,ivec1,ivec2,encrypt)
|
||||
char * input
|
||||
des_key_schedule * ks1
|
||||
des_key_schedule * ks2
|
||||
des_cblock * ivec1
|
||||
des_cblock * ivec2
|
||||
int encrypt
|
||||
PPCODE:
|
||||
{
|
||||
SV *s;
|
||||
STRLEN len,l;
|
||||
|
||||
l=SvCUR(ST(0));
|
||||
len=((((unsigned long)l)+7)/8)*8;
|
||||
s=sv_newmortal();
|
||||
sv_setpvn(s,"",0);
|
||||
SvGROW(s,len);
|
||||
SvCUR_set(s,len);
|
||||
des_3cbc_encrypt((des_cblock *)input,(des_cblock *)SvPV(s,na),
|
||||
l,*ks1,*ks2,ivec1,ivec2,encrypt);
|
||||
sv_setpvn(ST(3),(char *)ivec1,8);
|
||||
sv_setpvn(ST(4),(char *)ivec2,8);
|
||||
PUSHs(s);
|
||||
}
|
||||
|
||||
void
|
||||
des_cbc_cksum(input,ks,ivec)
|
||||
char * input
|
||||
des_key_schedule * ks
|
||||
des_cblock * ivec
|
||||
PPCODE:
|
||||
{
|
||||
SV *s1,*s2;
|
||||
STRLEN len,l;
|
||||
des_cblock c;
|
||||
unsigned long i1,i2;
|
||||
|
||||
s1=sv_newmortal();
|
||||
s2=sv_newmortal();
|
||||
l=SvCUR(ST(0));
|
||||
des_cbc_cksum((des_cblock *)input,(des_cblock *)c,
|
||||
l,*ks,ivec);
|
||||
i1=c[4]|(c[5]<<8)|(c[6]<<16)|(c[7]<<24);
|
||||
i2=c[0]|(c[1]<<8)|(c[2]<<16)|(c[3]<<24);
|
||||
sv_setiv(s1,i1);
|
||||
sv_setiv(s2,i2);
|
||||
sv_setpvn(ST(2),(char *)c,8);
|
||||
PUSHs(s1);
|
||||
PUSHs(s2);
|
||||
}
|
||||
|
||||
void
|
||||
des_cfb_encrypt(input,numbits,ks,ivec,encrypt)
|
||||
char * input
|
||||
int numbits
|
||||
des_key_schedule * ks
|
||||
des_cblock * ivec
|
||||
int encrypt
|
||||
PPCODE:
|
||||
{
|
||||
SV *s;
|
||||
STRLEN len;
|
||||
char *c;
|
||||
|
||||
len=SvCUR(ST(0));
|
||||
s=sv_newmortal();
|
||||
sv_setpvn(s,"",0);
|
||||
SvGROW(s,len);
|
||||
SvCUR_set(s,len);
|
||||
c=(char *)SvPV(s,na);
|
||||
des_cfb_encrypt((unsigned char *)input,(unsigned char *)c,
|
||||
(int)numbits,(long)len,*ks,ivec,encrypt);
|
||||
sv_setpvn(ST(3),(char *)ivec,8);
|
||||
PUSHs(s);
|
||||
}
|
||||
|
||||
des_cblock *
|
||||
des_ecb3_encrypt(input,ks1,ks2,encrypt)
|
||||
des_cblock * input
|
||||
des_key_schedule * ks1
|
||||
des_key_schedule * ks2
|
||||
int encrypt
|
||||
CODE:
|
||||
{
|
||||
des_cblock c;
|
||||
|
||||
des_ecb3_encrypt((des_cblock *)input,(des_cblock *)&c,
|
||||
*ks1,*ks2,encrypt);
|
||||
RETVAL= &c;
|
||||
}
|
||||
OUTPUT:
|
||||
RETVAL
|
||||
|
||||
void
|
||||
des_ofb_encrypt(input,numbits,ks,ivec)
|
||||
unsigned char * input
|
||||
int numbits
|
||||
des_key_schedule * ks
|
||||
des_cblock * ivec
|
||||
PPCODE:
|
||||
{
|
||||
SV *s;
|
||||
STRLEN len,l;
|
||||
unsigned char *c;
|
||||
|
||||
len=SvCUR(ST(0));
|
||||
s=sv_newmortal();
|
||||
sv_setpvn(s,"",0);
|
||||
SvGROW(s,len);
|
||||
SvCUR_set(s,len);
|
||||
c=(unsigned char *)SvPV(s,na);
|
||||
des_ofb_encrypt((unsigned char *)input,(unsigned char *)c,
|
||||
numbits,len,*ks,ivec);
|
||||
sv_setpvn(ST(3),(char *)ivec,8);
|
||||
PUSHs(s);
|
||||
}
|
||||
|
||||
void
|
||||
des_pcbc_encrypt(input,ks,ivec,encrypt)
|
||||
char * input
|
||||
des_key_schedule * ks
|
||||
des_cblock * ivec
|
||||
int encrypt
|
||||
PPCODE:
|
||||
{
|
||||
SV *s;
|
||||
STRLEN len,l;
|
||||
char *c;
|
||||
|
||||
l=SvCUR(ST(0));
|
||||
len=((((unsigned long)l)+7)/8)*8;
|
||||
s=sv_newmortal();
|
||||
sv_setpvn(s,"",0);
|
||||
SvGROW(s,len);
|
||||
SvCUR_set(s,len);
|
||||
c=(char *)SvPV(s,na);
|
||||
des_pcbc_encrypt((des_cblock *)input,(des_cblock *)c,
|
||||
l,*ks,ivec,encrypt);
|
||||
sv_setpvn(ST(2),(char *)c[len-8],8);
|
||||
PUSHs(s);
|
||||
}
|
||||
|
||||
des_cblock *
|
||||
des_random_key()
|
||||
CODE:
|
||||
{
|
||||
des_cblock c;
|
||||
|
||||
des_random_key(c);
|
||||
RETVAL=&c;
|
||||
}
|
||||
OUTPUT:
|
||||
RETVAL
|
||||
|
||||
des_cblock *
|
||||
des_string_to_key(str)
|
||||
char * str
|
||||
CODE:
|
||||
{
|
||||
des_cblock c;
|
||||
|
||||
des_string_to_key(str,&c);
|
||||
RETVAL=&c;
|
||||
}
|
||||
OUTPUT:
|
||||
RETVAL
|
||||
|
||||
void
|
||||
des_string_to_2keys(str)
|
||||
char * str
|
||||
PPCODE:
|
||||
{
|
||||
des_cblock c1,c2;
|
||||
SV *s1,*s2;
|
||||
|
||||
des_string_to_2keys(str,&c1,&c2);
|
||||
EXTEND(sp,2);
|
||||
s1=sv_newmortal();
|
||||
sv_setpvn(s1,(char *)c1,8);
|
||||
s2=sv_newmortal();
|
||||
sv_setpvn(s2,(char *)c2,8);
|
||||
PUSHs(s1);
|
||||
PUSHs(s2);
|
||||
}
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
/* General stuff */
|
||||
COPYRIGHT - Copyright info.
|
||||
MODES.DES - A description of the features of the different modes of DES.
|
||||
FILES - This file.
|
||||
INSTALL - How to make things compile.
|
||||
Imakefile - For use with kerberos.
|
||||
README - What this package is.
|
||||
VERSION - Which version this is and what was changed.
|
||||
KERBEROS - Kerberos version 4 notes.
|
||||
Makefile.PL - An old makefile to build with perl5, not current.
|
||||
Makefile.ssl - The SSLeay makefile
|
||||
Makefile.uni - The normal unix makefile.
|
||||
GNUmakefile - The makefile for use with glibc.
|
||||
makefile.bc - A Borland C makefile
|
||||
times - Some outputs from 'speed' on some machines.
|
||||
vms.com - For use when compiling under VMS
|
||||
|
||||
/* My SunOS des(1) replacement */
|
||||
des.c - des(1) source code.
|
||||
des.man - des(1) manual.
|
||||
|
||||
/* Testing and timing programs. */
|
||||
destest.c - Source for libdes.a test program.
|
||||
speed.c - Source for libdes.a timing program.
|
||||
rpw.c - Source for libdes.a testing password reading routines.
|
||||
|
||||
/* libdes.a source code */
|
||||
des_crypt.man - libdes.a manual page.
|
||||
des.h - Public libdes.a header file.
|
||||
ecb_enc.c - des_ecb_encrypt() source, this contains the basic DES code.
|
||||
ecb3_enc.c - des_ecb3_encrypt() source.
|
||||
cbc_ckm.c - des_cbc_cksum() source.
|
||||
cbc_enc.c - des_cbc_encrypt() source.
|
||||
ncbc_enc.c - des_cbc_encrypt() that is 'normal' in that it copies
|
||||
the new iv values back in the passed iv vector.
|
||||
ede_enc.c - des_ede3_cbc_encrypt() cbc mode des using triple DES.
|
||||
cbc3_enc.c - des_3cbc_encrypt() source, don't use this function.
|
||||
cfb_enc.c - des_cfb_encrypt() source.
|
||||
cfb64enc.c - des_cfb64_encrypt() cfb in 64 bit mode but setup to be
|
||||
used as a stream cipher.
|
||||
cfb64ede.c - des_ede3_cfb64_encrypt() cfb in 64 bit mode but setup to be
|
||||
used as a stream cipher and using triple DES.
|
||||
ofb_enc.c - des_cfb_encrypt() source.
|
||||
ofb64_enc.c - des_ofb_encrypt() ofb in 64 bit mode but setup to be
|
||||
used as a stream cipher.
|
||||
ofb64ede.c - des_ede3_ofb64_encrypt() ofb in 64 bit mode but setup to be
|
||||
used as a stream cipher and using triple DES.
|
||||
enc_read.c - des_enc_read() source.
|
||||
enc_writ.c - des_enc_write() source.
|
||||
pcbc_enc.c - des_pcbc_encrypt() source.
|
||||
qud_cksm.c - quad_cksum() source.
|
||||
rand_key.c - des_random_key() source.
|
||||
read_pwd.c - Source for des_read_password() plus related functions.
|
||||
set_key.c - Source for des_set_key().
|
||||
str2key.c - Covert a string of any length into a key.
|
||||
fcrypt.c - A small, fast version of crypt(3).
|
||||
des_locl.h - Internal libdes.a header file.
|
||||
podd.h - Odd parity tables - used in des_set_key().
|
||||
sk.h - Lookup tables used in des_set_key().
|
||||
spr.h - What is left of the S tables - used in ecb_encrypt().
|
||||
des_ver.h - header file for the external definition of the
|
||||
version string.
|
||||
des.doc - SSLeay documentation for the library.
|
||||
|
||||
/* The perl scripts - you can ignore these files they are only
|
||||
* included for the curious */
|
||||
des.pl - des in perl anyone? des_set_key and des_ecb_encrypt
|
||||
both done in a perl library.
|
||||
testdes.pl - Testing program for des.pl
|
||||
doIP - Perl script used to develop IP xor/shift code.
|
||||
doPC1 - Perl script used to develop PC1 xor/shift code.
|
||||
doPC2 - Generates sk.h.
|
||||
PC1 - Output of doPC1 should be the same as output from PC1.
|
||||
PC2 - used in development of doPC2.
|
||||
shifts.pl - Perl library used by my perl scripts.
|
||||
|
||||
/* I started making a perl5 dynamic library for libdes
|
||||
* but did not fully finish, these files are part of that effort. */
|
||||
DES.pm
|
||||
DES.pod
|
||||
DES.xs
|
||||
t
|
||||
typemap
|
||||
|
||||
/* The following are for use with sun RPC implementaions. */
|
||||
rpc_des.h
|
||||
rpc_enc.c
|
||||
|
||||
/* The following are contibuted by Mark Murray <mark@grondar.za>. They
|
||||
* are not normally built into libdes due to machine specific routines
|
||||
* contained in them. They are for use in the most recent incarnation of
|
||||
* export kerberos v 4 (eBones). */
|
||||
supp.c
|
||||
new_rkey.c
|
||||
|
||||
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
Check the CC and CFLAGS lines in the makefile
|
||||
|
||||
If your C library does not support the times(3) function, change the
|
||||
#define TIMES to
|
||||
#undef TIMES in speed.c
|
||||
If it does, check the HZ value for the times(3) function.
|
||||
If your system does not define CLK_TCK it will be assumed to
|
||||
be 100.0.
|
||||
|
||||
If possible use gcc v 2.7.?
|
||||
Turn on the maximum optimising (normally '-O3 -fomit-frame-pointer' for gcc)
|
||||
In recent times, some system compilers give better performace.
|
||||
|
||||
type 'make'
|
||||
|
||||
run './destest' to check things are ok.
|
||||
run './rpw' to check the tty code for reading passwords works.
|
||||
run './speed' to see how fast those optimisations make the library run :-)
|
||||
run './des_opts' to determin the best compile time options.
|
||||
|
||||
The output from des_opts should be put in the makefile options and des_enc.c
|
||||
should be rebuilt. For 64 bit computers, do not use the DES_PTR option.
|
||||
For the DEC Alpha, edit des.h and change DES_LONG to 'unsigned int'
|
||||
and then you can use the 'DES_PTR' option.
|
||||
|
||||
The file options.txt has the options listed for best speed on quite a
|
||||
few systems. Look and the options (UNROLL, PTR, RISC2 etc) and then
|
||||
turn on the relevant option in the Makefile.
|
||||
|
||||
There are some special Makefile targets that make life easier.
|
||||
make cc - standard cc build
|
||||
make gcc - standard gcc build
|
||||
make x86-elf - x86 assembler (elf), linux-elf.
|
||||
make x86-out - x86 assembler (a.out), FreeBSD
|
||||
make x86-solaris- x86 assembler
|
||||
make x86-bsdi - x86 assembler (a.out with primative assembler).
|
||||
|
||||
If at all possible use the assembler (for Windows NT/95, use
|
||||
asm/win32.obj to link with). The x86 assembler is very very fast.
|
||||
|
||||
A make install will by default install
|
||||
libdes.a in /usr/local/lib/libdes.a
|
||||
des in /usr/local/bin/des
|
||||
des_crypt.man in /usr/local/man/man3/des_crypt.3
|
||||
des.man in /usr/local/man/man1/des.1
|
||||
des.h in /usr/include/des.h
|
||||
|
||||
des(1) should be compatible with sunOS's but I have been unable to
|
||||
test it.
|
||||
|
||||
These routines should compile on MSDOS, most 32bit and 64bit version
|
||||
of Unix (BSD and SYSV) and VMS, without modification.
|
||||
The only problems should be #include files that are in the wrong places.
|
||||
|
||||
These routines can be compiled under MSDOS.
|
||||
I have successfully encrypted files using des(1) under MSDOS and then
|
||||
decrypted the files on a SparcStation.
|
||||
I have been able to compile and test the routines with
|
||||
Microsoft C v 5.1 and Turbo C v 2.0.
|
||||
The code in this library is in no way optimised for the 16bit
|
||||
operation of MSDOS.
|
||||
|
||||
When building for glibc, ignore all of the above and just unpack into
|
||||
glibc-1.??/des and then gmake as per normal.
|
||||
|
||||
As a final note on performace. Certain CPUs like sparcs and Alpha often give
|
||||
a %10 speed difference depending on the link order. It is rather anoying
|
||||
when one program reports 'x' DES encrypts a second and another reports
|
||||
'x*0.9' the speed.
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# This Imakefile has not been tested for a while but it should still
|
||||
# work when placed in the correct directory in the kerberos v 4 distribution
|
||||
|
||||
SRCS= cbc_cksm.c cbc_enc.c ecb_enc.c pcbc_enc.c \
|
||||
qud_cksm.c rand_key.c read_pwd.c set_key.c str2key.c \
|
||||
enc_read.c enc_writ.c fcrypt.c cfb_enc.c \
|
||||
ecb3_enc.c ofb_enc.c ofb64enc.c
|
||||
|
||||
OBJS= cbc_cksm.o cbc_enc.o ecb_enc.o pcbc_enc.o \
|
||||
qud_cksm.o rand_key.o read_pwd.o set_key.o str2key.o \
|
||||
enc_read.o enc_writ.o fcrypt.o cfb_enc.o \
|
||||
ecb3_enc.o ofb_enc.o ofb64enc.o
|
||||
|
||||
GENERAL=COPYRIGHT FILES INSTALL Imakefile README VERSION makefile times \
|
||||
vms.com KERBEROS
|
||||
DES= des.c des.man
|
||||
TESTING=destest.c speed.c rpw.c
|
||||
LIBDES= des_crypt.man des.h des_locl.h podd.h sk.h spr.h
|
||||
|
||||
PERL= des.pl testdes.pl doIP doPC1 doPC2 PC1 PC2 shifts.pl
|
||||
|
||||
CODE= $(GENERAL) $(DES) $(TESTING) $(SRCS) $(LIBDES) $(PERL)
|
||||
|
||||
SRCDIR=$(SRCTOP)/lib/des
|
||||
|
||||
DBG= -O
|
||||
INCLUDE= -I$(SRCDIR)
|
||||
CC= cc
|
||||
|
||||
library_obj_rule()
|
||||
|
||||
install_library_target(des,$(OBJS),$(SRCS),)
|
||||
|
||||
test(destest,libdes.a,)
|
||||
test(rpw,libdes.a,)
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
[ This is an old file, I don't know if it is true anymore
|
||||
but I will leave the file here - eay 21/11/95 ]
|
||||
|
||||
To use this library with Bones (kerberos without DES):
|
||||
1) Get my modified Bones - eBones. It can be found on
|
||||
gondwana.ecr.mu.oz.au (128.250.1.63) /pub/athena/eBones-p9.tar.Z
|
||||
and
|
||||
nic.funet.fi (128.214.6.100) /pub/unix/security/Kerberos/eBones-p9.tar.Z
|
||||
|
||||
2) Unpack this library in src/lib/des, makeing sure it is version
|
||||
3.00 or greater (libdes.tar.93-10-07.Z). This versions differences
|
||||
from the version in comp.sources.misc volume 29 patchlevel2.
|
||||
The primarily difference is that it should compile under kerberos :-).
|
||||
It can be found at.
|
||||
ftp.psy.uq.oz.au (130.102.32.1) /pub/DES/libdes.tar.93-10-07.Z
|
||||
|
||||
Now do a normal kerberos build and things should work.
|
||||
|
||||
One problem I found when I was build on my local sun.
|
||||
---
|
||||
For sunOS 4.1.1 apply the following patch to src/util/ss/make_commands.c
|
||||
|
||||
*** make_commands.c.orig Fri Jul 3 04:18:35 1987
|
||||
--- make_commands.c Wed May 20 08:47:42 1992
|
||||
***************
|
||||
*** 98,104 ****
|
||||
if (!rename(o_file, z_file)) {
|
||||
if (!vfork()) {
|
||||
chdir("/tmp");
|
||||
! execl("/bin/ld", "ld", "-o", o_file+5, "-s", "-r", "-n",
|
||||
z_file+5, 0);
|
||||
perror("/bin/ld");
|
||||
_exit(1);
|
||||
--- 98,104 ----
|
||||
if (!rename(o_file, z_file)) {
|
||||
if (!vfork()) {
|
||||
chdir("/tmp");
|
||||
! execl("/bin/ld", "ld", "-o", o_file+5, "-s", "-r",
|
||||
z_file+5, 0);
|
||||
perror("/bin/ld");
|
||||
_exit(1);
|
||||
|
|
@ -28,7 +28,7 @@ LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
|
|||
qud_cksm.c rand_key.c rpc_enc.c set_key.c \
|
||||
des_enc.c fcrypt_b.c \
|
||||
xcbc_enc.c \
|
||||
str2key.c cfb64ede.c ofb64ede.c des_old.c des_old2.c \
|
||||
str2key.c cfb64ede.c ofb64ede.c \
|
||||
read2pwd.c
|
||||
|
||||
LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \
|
||||
|
|
@ -37,11 +37,11 @@ LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \
|
|||
ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \
|
||||
${DES_ENC} \
|
||||
fcrypt.o xcbc_enc.o rpc_enc.o cbc_cksm.o \
|
||||
des_old.o des_old2.o read2pwd.o
|
||||
read2pwd.o
|
||||
|
||||
SRC= $(LIBSRC)
|
||||
|
||||
EXHEADER= des.h des_old.h
|
||||
EXHEADER= des.h
|
||||
HEADER= des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER)
|
||||
|
||||
ALL= $(GENERAL) $(SRC) $(HEADER)
|
||||
|
|
@ -106,64 +106,52 @@ clean:
|
|||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
||||
cbc_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
cbc_cksm.o: ../../include/openssl/des.h
|
||||
cbc_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
cbc_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
cbc_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
cbc_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
cbc_cksm.o: cbc_cksm.c des_locl.h
|
||||
cbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
cbc_enc.o: ../../include/openssl/des.h
|
||||
cbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
cbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
cbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
cbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
cbc_enc.o: cbc_enc.c des_locl.h ncbc_enc.c
|
||||
cfb64ede.o: ../../e_os.h ../../include/openssl/des.h
|
||||
cfb64ede.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
cfb64ede.o: ../../include/openssl/e_os2.h
|
||||
cfb64ede.o: ../../include/openssl/opensslconf.h
|
||||
cfb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
cfb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
cfb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
cfb64ede.o: cfb64ede.c des_locl.h
|
||||
cfb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
cfb64enc.o: ../../include/openssl/des.h
|
||||
cfb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
cfb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
cfb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
cfb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
cfb64enc.o: cfb64enc.c des_locl.h
|
||||
cfb_enc.o: ../../e_os.h ../../include/openssl/des.h
|
||||
cfb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
cfb_enc.o: ../../include/openssl/e_os2.h
|
||||
cfb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/ossl_typ.h
|
||||
cfb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
cfb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
||||
cfb_enc.o: ../../include/openssl/ui_compat.h cfb_enc.c des_locl.h
|
||||
des_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
des_enc.o: ../../include/openssl/e_os2.h
|
||||
des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
||||
des_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
des_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
des_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
des_enc.o: des_enc.c des_locl.h ncbc_enc.c spr.h
|
||||
des_old.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
des_old.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
des_old.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
|
||||
des_old.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
des_old.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
||||
des_old.o: ../../include/openssl/ui_compat.h des_old.c
|
||||
des_old2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
des_old2.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
des_old2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
|
||||
des_old2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
des_old2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
||||
des_old2.o: ../../include/openssl/ui_compat.h des_old2.c
|
||||
ecb3_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
ecb3_enc.o: ../../include/openssl/des.h
|
||||
ecb3_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
ecb3_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
ecb3_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
ecb3_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
ecb3_enc.o: des_locl.h ecb3_enc.c
|
||||
ecb_enc.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
|
||||
ecb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
ecb_enc.o: ../../include/openssl/des.h
|
||||
ecb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
ecb_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
|
||||
ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
|
|
@ -171,7 +159,7 @@ ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
|||
ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c
|
||||
enc_read.o: ../../e_os.h ../../include/openssl/bio.h
|
||||
enc_read.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
enc_read.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
enc_read.o: ../../include/openssl/des.h
|
||||
enc_read.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
|
||||
enc_read.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
|
||||
enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
|
||||
|
|
@ -181,7 +169,7 @@ enc_read.o: ../../include/openssl/ui_compat.h ../cryptlib.h des_locl.h
|
|||
enc_read.o: enc_read.c
|
||||
enc_writ.o: ../../e_os.h ../../include/openssl/bio.h
|
||||
enc_writ.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
enc_writ.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
enc_writ.o: ../../include/openssl/des.h
|
||||
enc_writ.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
|
||||
enc_writ.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
|
||||
enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
|
||||
|
|
@ -190,82 +178,82 @@ enc_writ.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
|||
enc_writ.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
enc_writ.o: ../cryptlib.h des_locl.h enc_writ.c
|
||||
fcrypt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
fcrypt.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
fcrypt.o: ../../include/openssl/e_os2.h
|
||||
fcrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
||||
fcrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
fcrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
fcrypt.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
fcrypt.o: des_locl.h fcrypt.c
|
||||
fcrypt_b.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
fcrypt_b.o: ../../include/openssl/des.h
|
||||
fcrypt_b.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
fcrypt_b.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
fcrypt_b.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
fcrypt_b.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
fcrypt_b.o: des_locl.h fcrypt_b.c
|
||||
ofb64ede.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
ofb64ede.o: ../../include/openssl/des.h
|
||||
ofb64ede.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
ofb64ede.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
ofb64ede.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
ofb64ede.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
ofb64ede.o: des_locl.h ofb64ede.c
|
||||
ofb64enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
ofb64enc.o: ../../include/openssl/des.h
|
||||
ofb64enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
ofb64enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
ofb64enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
ofb64enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
ofb64enc.o: des_locl.h ofb64enc.c
|
||||
ofb_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
ofb_enc.o: ../../include/openssl/des.h
|
||||
ofb_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
ofb_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
ofb_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
ofb_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
ofb_enc.o: des_locl.h ofb_enc.c
|
||||
pcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
pcbc_enc.o: ../../include/openssl/des.h
|
||||
pcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
pcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
pcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
pcbc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
pcbc_enc.o: des_locl.h pcbc_enc.c
|
||||
qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
qud_cksm.o: ../../include/openssl/des.h
|
||||
qud_cksm.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
qud_cksm.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
qud_cksm.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
qud_cksm.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
qud_cksm.o: des_locl.h qud_cksm.c
|
||||
rand_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
rand_key.o: ../../include/openssl/des.h
|
||||
rand_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
rand_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
|
||||
rand_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
rand_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
||||
rand_key.o: ../../include/openssl/ui_compat.h rand_key.c
|
||||
read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
read2pwd.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
read2pwd.o: ../../include/openssl/e_os2.h
|
||||
read2pwd.o: ../../include/openssl/opensslconf.h
|
||||
read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
|
||||
read2pwd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
read2pwd.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
||||
read2pwd.o: ../../include/openssl/ui_compat.h read2pwd.c
|
||||
rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
rpc_enc.o: ../../include/openssl/des.h
|
||||
rpc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
|
||||
set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
set_key.o: ../../include/openssl/e_os2.h
|
||||
set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
||||
set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
set_key.o: des_locl.h set_key.c
|
||||
str2key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
str2key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
str2key.o: ../../include/openssl/e_os2.h
|
||||
str2key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
|
||||
str2key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
str2key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
str2key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
|
||||
str2key.o: des_locl.h str2key.c
|
||||
xcbc_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
xcbc_enc.o: ../../include/openssl/des.h
|
||||
xcbc_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
|
||||
xcbc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
|
||||
xcbc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
|
||||
|
|
|
|||
|
|
@ -1,412 +0,0 @@
|
|||
Fixed the weak key values which were wrong :-(
|
||||
Defining SIGACTION causes sigaction() to be used instead of signal().
|
||||
SIGUSR1/SIGUSR2 are no longer mapped in the read tty stuff because it
|
||||
can cause problems. This should hopefully not affect normal
|
||||
applications.
|
||||
|
||||
Version 4.04
|
||||
Fixed a few tests in destest. Also added x86 assember for
|
||||
des_ncbc_encrypt() which is the standard cbc mode function.
|
||||
This makes a very very large performace difference.
|
||||
Ariel Glenn ariel@columbia.edu reports that the terminal
|
||||
'turn echo off' can return (errno == EINVAL) under solaris
|
||||
when redirection is used. So I now catch that as well as ENOTTY.
|
||||
|
||||
|
||||
Version 4.03
|
||||
Left a static out of enc_write.c, which caused to buffer to be
|
||||
continiously malloc()ed. Does anyone use these functions? I keep
|
||||
on feeling like removing them since I only had these in there
|
||||
for a version of kerberised login. Anyway, this was pointed out
|
||||
by Theo de Raadt <deraadt@cvs.openbsd.org>
|
||||
The 'n' bit ofb code was wrong, it was not shifting the shift
|
||||
register. It worked correctly for n == 64. Thanks to
|
||||
Gigi Ankeny <Gigi.Ankeny@Eng.Sun.COM> for pointing this one out.
|
||||
|
||||
Version 4.02
|
||||
I was doing 'if (memcmp(weak_keys[i],key,sizeof(key)) == 0)'
|
||||
when checking for weak keys which is wrong :-(, pointed out by
|
||||
Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>.
|
||||
|
||||
Version 4.01
|
||||
Even faster inner loop in the DES assembler for x86 and a modification
|
||||
for IP/FP which is faster on x86. Both of these changes are
|
||||
from Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>. His
|
||||
changes make the assembler run %40 faster on a pentium. This is just
|
||||
a case of getting the instruction sequence 'just right'.
|
||||
All credit to 'Svend' :-)
|
||||
Quite a few special x86 'make' targets.
|
||||
A libdes-l (lite) distribution.
|
||||
|
||||
Version 4.00
|
||||
After a bit of a pause, I'll up the major version number since this
|
||||
is mostly a performace release. I've added x86 assembler and
|
||||
added more options for performance. A %28 speedup for gcc
|
||||
on a pentium and the assembler is a %50 speedup.
|
||||
MIPS CPU's, sparc and Alpha are the main CPU's with speedups.
|
||||
Run des_opts to work out which options should be used.
|
||||
DES_RISC1/DES_RISC2 use alternative inner loops which use
|
||||
more registers but should give speedups on any CPU that does
|
||||
dual issue (pentium). DES_UNROLL unrolls the inner loop,
|
||||
which costs in code size.
|
||||
|
||||
Version 3.26
|
||||
I've finally removed one of the shifts in D_ENCRYPT. This
|
||||
meant I've changed the des_SPtrans table (spr.h), the set_key()
|
||||
function and some things in des_enc.c. This has definitly
|
||||
made things faster :-). I've known about this one for some
|
||||
time but I've been too lazy to follow it up :-).
|
||||
Noticed that in the D_ENCRYPT() macro, we can just do L^=(..)^(..)^..
|
||||
instead of L^=((..)|(..)|(..).. This should save a register at
|
||||
least.
|
||||
Assember for x86. The file to replace is des_enc.c, which is replaced
|
||||
by one of the assembler files found in asm. Look at des/asm/readme
|
||||
for more info.
|
||||
|
||||
/* Modification to fcrypt so it can be compiled to support
|
||||
HPUX 10.x's long password format, define -DLONGCRYPT to use this.
|
||||
Thanks to Jens Kupferschmidt <bt1cu@hpboot.rz.uni-leipzig.de>. */
|
||||
|
||||
SIGWINCH case put in des_read_passwd() so the function does not
|
||||
'exit' if this function is received.
|
||||
|
||||
Version 3.25 17/07/96
|
||||
Modified read_pwd.c so that stdin can be read if not a tty.
|
||||
Thanks to Jeff Barber <jeffb@issl.atl.hp.com> for the patches.
|
||||
des_init_random_number_generator() shortened due to VMS linker
|
||||
limits.
|
||||
Added RSA's DESX cbc mode. It is a form of cbc encryption, with 2
|
||||
8 byte quantites xored before and after encryption.
|
||||
des_xcbc_encryption() - the name is funny to preserve the des_
|
||||
prefix on all functions.
|
||||
|
||||
Version 3.24 20/04/96
|
||||
The DES_PTR macro option checked and used by SSLeay configuration
|
||||
|
||||
Version 3.23 11/04/96
|
||||
Added DES_LONG. If defined to 'unsigned int' on the DEC Alpha,
|
||||
it gives a %20 speedup :-)
|
||||
Fixed the problem with des.pl under perl5. The patches were
|
||||
sent by Ed Kubaitis (ejk@uiuc.edu).
|
||||
if fcrypt.c, changed values to handle illegal salt values the way
|
||||
normal crypt() implementations do. Some programs apparently use
|
||||
them :-(. The patch was sent by Bjorn Gronvall <bg@sics.se>
|
||||
|
||||
Version 3.22 29/11/95
|
||||
Bug in des(1), an error with the uuencoding stuff when the
|
||||
'data' is small, thanks to Geoff Keating <keagchon@mehta.anu.edu.au>
|
||||
for the patch.
|
||||
|
||||
Version 3.21 22/11/95
|
||||
After some emailing back and forth with
|
||||
Colin Plumb <colin@nyx10.cs.du.edu>, I've tweaked a few things
|
||||
and in a future version I will probably put in some of the
|
||||
optimisation he suggested for use with the DES_USE_PTR option.
|
||||
Extra routines from Mark Murray <mark@grondar.za> for use in
|
||||
freeBSD. They mostly involve random number generation for use
|
||||
with kerberos. They involve evil machine specific system calls
|
||||
etc so I would normally suggest pushing this stuff into the
|
||||
application and/or using RAND_seed()/RAND_bytes() if you are
|
||||
using this DES library as part of SSLeay.
|
||||
Redone the read_pw() function so that it is cleaner and
|
||||
supports termios, thanks to Sameer Parekh <sameer@c2.org>
|
||||
for the initial patches for this.
|
||||
Renamed 3ecb_encrypt() to ecb3_encrypt(). This has been
|
||||
done just to make things more consistent.
|
||||
I have also now added triple DES versions of cfb and ofb.
|
||||
|
||||
Version 3.20
|
||||
Damn, Damn, Damn, as pointed out by Mike_Spreitzer.PARC@xerox.com,
|
||||
my des_random_seed() function was only copying 4 bytes of the
|
||||
passed seed into the init structure. It is now fixed to copy 8.
|
||||
My own suggestion is to used something like MD5 :-)
|
||||
|
||||
Version 3.19
|
||||
While looking at my code one day, I though, why do I keep on
|
||||
calling des_encrypt(in,out,ks,enc) when every function that
|
||||
calls it has in and out the same. So I dropped the 'out'
|
||||
parameter, people should not be using this function.
|
||||
|
||||
Version 3.18 30/08/95
|
||||
Fixed a few bit with the distribution and the filenames.
|
||||
3.17 had been munged via a move to DOS and back again.
|
||||
NO CODE CHANGES
|
||||
|
||||
Version 3.17 14/07/95
|
||||
Fixed ede3 cbc which I had broken in 3.16. I have also
|
||||
removed some unneeded variables in 7-8 of the routines.
|
||||
|
||||
Version 3.16 26/06/95
|
||||
Added des_encrypt2() which does not use IP/FP, used by triple
|
||||
des routines. Tweaked things a bit elsewhere. %13 speedup on
|
||||
sparc and %6 on a R4400 for ede3 cbc mode.
|
||||
|
||||
Version 3.15 06/06/95
|
||||
Added des_ncbc_encrypt(), it is des_cbc mode except that it is
|
||||
'normal' and copies the new iv value back over the top of the
|
||||
passed parameter.
|
||||
CHANGED des_ede3_cbc_encrypt() so that it too now overwrites
|
||||
the iv. THIS WILL BREAK EXISTING CODE, but since this function
|
||||
only new, I feel I can change it, not so with des_cbc_encrypt :-(.
|
||||
I need to update the documentation.
|
||||
|
||||
Version 3.14 31/05/95
|
||||
New release upon the world, as part of my SSL implementation.
|
||||
New copyright and usage stuff. Basically free for all to use
|
||||
as long as you say it came from me :-)
|
||||
|
||||
Version 3.13 31/05/95
|
||||
A fix in speed.c, if HZ is not defined, I set it to 100.0
|
||||
which is reasonable for most unixes except SunOS 4.x.
|
||||
I now have a #ifdef sun but timing for SunOS 4.x looked very
|
||||
good :-(. At my last job where I used SunOS 4.x, it was
|
||||
defined to be 60.0 (look at the old INSTALL documentation), at
|
||||
the last release had it changed to 100.0 since I now work with
|
||||
Solaris2 and SVR4 boxes.
|
||||
Thanks to Rory Chisholm <rchishol@math.ethz.ch> for pointing this
|
||||
one out.
|
||||
|
||||
Version 3.12 08/05/95
|
||||
As pointed out by The Crypt Keeper <tck@bend.UCSD.EDU>,
|
||||
my D_ENCRYPT macro in crypt() had an un-necessary variable.
|
||||
It has been removed.
|
||||
|
||||
Version 3.11 03/05/95
|
||||
Added des_ede3_cbc_encrypt() which is cbc mode des with 3 keys
|
||||
and one iv. It is a standard and I needed it for my SSL code.
|
||||
It makes more sense to use this for triple DES than
|
||||
3cbc_encrypt(). I have also added (or should I say tested :-)
|
||||
cfb64_encrypt() which is cfb64 but it will encrypt a partial
|
||||
number of bytes - 3 bytes in 3 bytes out. Again this is for
|
||||
my SSL library, as a form of encryption to use with SSL
|
||||
telnet.
|
||||
|
||||
Version 3.10 22/03/95
|
||||
Fixed a bug in 3cbc_encrypt() :-(. When making repeated calls
|
||||
to cbc3_encrypt, the 2 iv values that were being returned to
|
||||
be used in the next call were reversed :-(.
|
||||
Many thanks to Bill Wade <wade@Stoner.COM> for pointing out
|
||||
this error.
|
||||
|
||||
Version 3.09 01/02/95
|
||||
Fixed des_random_key to far more random, it was rather feeble
|
||||
with regards to picking the initial seed. The problem was
|
||||
pointed out by Olaf Kirch <okir@monad.swb.de>.
|
||||
|
||||
Version 3.08 14/12/94
|
||||
Added Makefile.PL so libdes can be built into perl5.
|
||||
Changed des_locl.h so RAND is always defined.
|
||||
|
||||
Version 3.07 05/12/94
|
||||
Added GNUmake and stuff so the library can be build with
|
||||
glibc.
|
||||
|
||||
Version 3.06 30/08/94
|
||||
Added rpc_enc.c which contains _des_crypt. This is for use in
|
||||
secure_rpc v 4.0
|
||||
Finally fixed the cfb_enc problems.
|
||||
Fixed a few parameter parsing bugs in des (-3 and -b), thanks
|
||||
to Rob McMillan <R.McMillan@its.gu.edu.au>
|
||||
|
||||
Version 3.05 21/04/94
|
||||
for unsigned long l; gcc does not produce ((l>>34) == 0)
|
||||
This causes bugs in cfb_enc.
|
||||
Thanks to Hadmut Danisch <danisch@ira.uka.de>
|
||||
|
||||
Version 3.04 20/04/94
|
||||
Added a version number to des.c and libdes.a
|
||||
|
||||
Version 3.03 12/01/94
|
||||
Fixed a bug in non zero iv in 3cbc_enc.
|
||||
|
||||
Version 3.02 29/10/93
|
||||
I now work in a place where there are 6+ architectures and 14+
|
||||
OS versions :-).
|
||||
Fixed TERMIO definition so the most sys V boxes will work :-)
|
||||
|
||||
Release upon comp.sources.misc
|
||||
Version 3.01 08/10/93
|
||||
Added des_3cbc_encrypt()
|
||||
|
||||
Version 3.00 07/10/93
|
||||
Fixed up documentation.
|
||||
quad_cksum definitely compatible with MIT's now.
|
||||
|
||||
Version 2.30 24/08/93
|
||||
Triple DES now defaults to triple cbc but can do triple ecb
|
||||
with the -b flag.
|
||||
Fixed some MSDOS uuen/uudecoding problems, thanks to
|
||||
Added prototypes.
|
||||
|
||||
Version 2.22 29/06/93
|
||||
Fixed a bug in des_is_weak_key() which stopped it working :-(
|
||||
thanks to engineering@MorningStar.Com.
|
||||
|
||||
Version 2.21 03/06/93
|
||||
des(1) with no arguments gives quite a bit of help.
|
||||
Added -c (generate ckecksum) flag to des(1).
|
||||
Added -3 (triple DES) flag to des(1).
|
||||
Added cfb and ofb routines to the library.
|
||||
|
||||
Version 2.20 11/03/93
|
||||
Added -u (uuencode) flag to des(1).
|
||||
I have been playing with byte order in quad_cksum to make it
|
||||
compatible with MIT's version. All I can say is avid this
|
||||
function if possible since MIT's output is endian dependent.
|
||||
|
||||
Version 2.12 14/10/92
|
||||
Added MSDOS specific macro in ecb_encrypt which gives a %70
|
||||
speed up when the code is compiled with turbo C.
|
||||
|
||||
Version 2.11 12/10/92
|
||||
Speedup in set_key (recoding of PC-1)
|
||||
I now do it in 47 simple operations, down from 60.
|
||||
Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
|
||||
for motivating me to look for a faster system :-)
|
||||
The speedup is probably less that 1% but it is still 13
|
||||
instructions less :-).
|
||||
|
||||
Version 2.10 06/10/92
|
||||
The code now works on the 64bit ETA10 and CRAY without modifications or
|
||||
#defines. I believe the code should work on any machine that
|
||||
defines long, int or short to be 8 bytes long.
|
||||
Thanks to Shabbir J. Safdar (shabby@mentor.cc.purdue.edu)
|
||||
for helping me fix the code to run on 64bit machines (he had
|
||||
access to an ETA10).
|
||||
Thanks also to John Fletcher <john_fletcher@lccmail.ocf.llnl.gov>
|
||||
for testing the routines on a CRAY.
|
||||
read_password.c has been renamed to read_passwd.c
|
||||
string_to_key.c has been renamed to string2key.c
|
||||
|
||||
Version 2.00 14/09/92
|
||||
Made mods so that the library should work on 64bit CPU's.
|
||||
Removed all my uchar and ulong defs. To many different
|
||||
versions of unix define them in their header files in too many
|
||||
different combinations :-)
|
||||
IRIX - Sillicon Graphics mods (mostly in read_password.c).
|
||||
Thanks to Andrew Daviel (advax@erich.triumf.ca)
|
||||
|
||||
Version 1.99 26/08/92
|
||||
Fixed a bug or 2 in enc_read.c
|
||||
Fixed a bug in enc_write.c
|
||||
Fixed a pseudo bug in fcrypt.c (very obscure).
|
||||
|
||||
Version 1.98 31/07/92
|
||||
Support for the ETA10. This is a strange machine that defines
|
||||
longs and ints as 8 bytes and shorts as 4 bytes.
|
||||
Since I do evil things with long * that assume that they are 4
|
||||
bytes. Look in the Makefile for the option to compile for
|
||||
this machine. quad_cksum appears to have problems but I
|
||||
will don't have the time to fix it right now, and this is not
|
||||
a function that uses DES and so will not effect the main uses
|
||||
of the library.
|
||||
|
||||
Version 1.97 20/05/92 eay
|
||||
Fixed the Imakefile and made some changes to des.h to fix some
|
||||
problems when building this package with Kerberos v 4.
|
||||
|
||||
Version 1.96 18/05/92 eay
|
||||
Fixed a small bug in string_to_key() where problems could
|
||||
occur if des_check_key was set to true and the string
|
||||
generated a weak key.
|
||||
|
||||
Patch2 posted to comp.sources.misc
|
||||
Version 1.95 13/05/92 eay
|
||||
Added an alternative version of the D_ENCRYPT macro in
|
||||
ecb_encrypt and fcrypt. Depending on the compiler, one version or the
|
||||
other will be faster. This was inspired by
|
||||
Dana How <how@isl.stanford.edu>, and her pointers about doing the
|
||||
*(ulong *)((uchar *)ptr+(value&0xfc))
|
||||
vs
|
||||
ptr[value&0x3f]
|
||||
to stop the C compiler doing a <<2 to convert the long array index.
|
||||
|
||||
Version 1.94 05/05/92 eay
|
||||
Fixed an incompatibility between my string_to_key and the MIT
|
||||
version. When the key is longer than 8 chars, I was wrapping
|
||||
with a different method. To use the old version, define
|
||||
OLD_STR_TO_KEY in the makefile. Thanks to
|
||||
viktor@newsu.shearson.com (Viktor Dukhovni).
|
||||
|
||||
Version 1.93 28/04/92 eay
|
||||
Fixed the VMS mods so that echo is now turned off in
|
||||
read_password. Thanks again to brennan@coco.cchs.su.oz.AU.
|
||||
MSDOS support added. The routines can be compiled with
|
||||
Turbo C (v2.0) and MSC (v5.1). Make sure MSDOS is defined.
|
||||
|
||||
Patch1 posted to comp.sources.misc
|
||||
Version 1.92 13/04/92 eay
|
||||
Changed D_ENCRYPT so that the rotation of R occurs outside of
|
||||
the loop. This required rotating all the longs in sp.h (now
|
||||
called spr.h). Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
|
||||
speed.c has been changed so it will work without SIGALRM. If
|
||||
times(3) is not present it will try to use ftime() instead.
|
||||
|
||||
Version 1.91 08/04/92 eay
|
||||
Added -E/-D options to des(1) so it can use string_to_key.
|
||||
Added SVR4 mods suggested by witr@rwwa.COM
|
||||
Added VMS mods suggested by brennan@coco.cchs.su.oz.AU. If
|
||||
anyone knows how to turn of tty echo in VMS please tell me or
|
||||
implement it yourself :-).
|
||||
Changed FILE *IN/*OUT to *DES_IN/*DES_OUT since it appears VMS
|
||||
does not like IN/OUT being used.
|
||||
|
||||
Libdes posted to comp.sources.misc
|
||||
Version 1.9 24/03/92 eay
|
||||
Now contains a fast small crypt replacement.
|
||||
Added des(1) command.
|
||||
Added des_rw_mode so people can use cbc encryption with
|
||||
enc_read and enc_write.
|
||||
|
||||
Version 1.8 15/10/91 eay
|
||||
Bug in cbc_cksum.
|
||||
Many thanks to Keith Reynolds (keithr@sco.COM) for pointing this
|
||||
one out.
|
||||
|
||||
Version 1.7 24/09/91 eay
|
||||
Fixed set_key :-)
|
||||
set_key is 4 times faster and takes less space.
|
||||
There are a few minor changes that could be made.
|
||||
|
||||
Version 1.6 19/09/1991 eay
|
||||
Finally go IP and FP finished.
|
||||
Now I need to fix set_key.
|
||||
This version is quite a bit faster that 1.51
|
||||
|
||||
Version 1.52 15/06/1991 eay
|
||||
20% speedup in ecb_encrypt by changing the E bit selection
|
||||
to use 2 32bit words. This also required modification of the
|
||||
sp table. There is still a way to speedup the IP and IP-1
|
||||
(hints from outer@sq.com) still working on this one :-(.
|
||||
|
||||
Version 1.51 07/06/1991 eay
|
||||
Faster des_encrypt by loop unrolling
|
||||
Fixed bug in quad_cksum.c (thanks to hughes@logos.ucs.indiana.edu)
|
||||
|
||||
Version 1.50 28/05/1991 eay
|
||||
Optimised the code a bit more for the sparc. I have improved the
|
||||
speed of the inner des_encrypt by speeding up the initial and
|
||||
final permutations.
|
||||
|
||||
Version 1.40 23/10/1990 eay
|
||||
Fixed des_random_key, it did not produce a random key :-(
|
||||
|
||||
Version 1.30 2/10/1990 eay
|
||||
Have made des_quad_cksum the same as MIT's, the full package
|
||||
should be compatible with MIT's
|
||||
Have tested on a DECstation 3100
|
||||
Still need to fix des_set_key (make it faster).
|
||||
Does des_cbc_encrypts at 70.5k/sec on a 3100.
|
||||
|
||||
Version 1.20 18/09/1990 eay
|
||||
Fixed byte order dependencies.
|
||||
Fixed (I hope) all the word alignment problems.
|
||||
Speedup in des_ecb_encrypt.
|
||||
|
||||
Version 1.10 11/09/1990 eay
|
||||
Added des_enc_read and des_enc_write.
|
||||
Still need to fix des_quad_cksum.
|
||||
Still need to document des_enc_read and des_enc_write.
|
||||
|
||||
Version 1.00 27/08/1990 eay
|
||||
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
/* crypto/des/cbc3_enc.c */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
* This package is an SSL implementation written
|
||||
* by Eric Young (eay@cryptsoft.com).
|
||||
* The implementation was written so as to conform with Netscapes SSL.
|
||||
*
|
||||
* This library is free for commercial and non-commercial use as long as
|
||||
* the following conditions are aheared to. The following conditions
|
||||
* apply to all code found in this distribution, be it the RC4, RSA,
|
||||
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
||||
* included with this distribution is covered by the same copyright terms
|
||||
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
* Copyright remains Eric Young's, and as such any Copyright notices in
|
||||
* the code are not to be removed.
|
||||
* If this package is used in a product, Eric Young should be given attribution
|
||||
* as the author of the parts of the library used.
|
||||
* This can be in the form of a textual message at program startup or
|
||||
* in documentation (online or textual) provided with the package.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* "This product includes cryptographic software written by
|
||||
* Eric Young (eay@cryptsoft.com)"
|
||||
* The word 'cryptographic' can be left out if the rouines from the library
|
||||
* being used are not cryptographic related :-).
|
||||
* 4. If you include any Windows specific code (or a derivative thereof) from
|
||||
* the apps directory (application code) you must include an acknowledgement:
|
||||
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* The licence and distribution terms for any publically available version or
|
||||
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
||||
* copied and put under another distribution licence
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
|
||||
#include "des_locl.h"
|
||||
|
||||
/* HAS BUGS! DON'T USE - this is only present for use in des.c */
|
||||
void DES_3cbc_encrypt(DES_cblock *input, DES_cblock *output, long length,
|
||||
DES_key_schedule ks1, DES_key_schedule ks2,
|
||||
DES_cblock *iv1, DES_cblock *iv2, int enc)
|
||||
{
|
||||
int off = ((int)length - 1) / 8;
|
||||
long l8 = ((length + 7) / 8) * 8;
|
||||
DES_cblock niv1, niv2;
|
||||
|
||||
if (enc == DES_ENCRYPT) {
|
||||
DES_cbc_encrypt((unsigned char *)input,
|
||||
(unsigned char *)output, length, &ks1, iv1, enc);
|
||||
if (length >= sizeof(DES_cblock))
|
||||
memcpy(niv1, output[off], sizeof(DES_cblock));
|
||||
DES_cbc_encrypt((unsigned char *)output,
|
||||
(unsigned char *)output, l8, &ks2, iv1, !enc);
|
||||
DES_cbc_encrypt((unsigned char *)output,
|
||||
(unsigned char *)output, l8, &ks1, iv2, enc);
|
||||
if (length >= sizeof(DES_cblock))
|
||||
memcpy(niv2, output[off], sizeof(DES_cblock));
|
||||
} else {
|
||||
if (length >= sizeof(DES_cblock))
|
||||
memcpy(niv2, input[off], sizeof(DES_cblock));
|
||||
DES_cbc_encrypt((unsigned char *)input,
|
||||
(unsigned char *)output, l8, &ks1, iv2, enc);
|
||||
DES_cbc_encrypt((unsigned char *)output,
|
||||
(unsigned char *)output, l8, &ks2, iv1, !enc);
|
||||
if (length >= sizeof(DES_cblock))
|
||||
memcpy(niv1, output[off], sizeof(DES_cblock));
|
||||
DES_cbc_encrypt((unsigned char *)output,
|
||||
(unsigned char *)output, length, &ks1, iv1, enc);
|
||||
}
|
||||
memcpy(*iv1, niv1, sizeof(DES_cblock));
|
||||
memcpy(*iv2, niv2, sizeof(DES_cblock));
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -92,16 +92,6 @@ typedef struct DES_ks {
|
|||
} ks[16];
|
||||
} DES_key_schedule;
|
||||
|
||||
# ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
|
||||
# ifndef OPENSSL_ENABLE_OLD_DES_SUPPORT
|
||||
# define OPENSSL_ENABLE_OLD_DES_SUPPORT
|
||||
# endif
|
||||
# endif
|
||||
|
||||
# ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT
|
||||
# include <openssl/des_old.h>
|
||||
# endif
|
||||
|
||||
# define DES_KEY_SZ (sizeof(DES_cblock))
|
||||
# define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,219 +0,0 @@
|
|||
=pod
|
||||
|
||||
=head1 NAME
|
||||
|
||||
des - encrypt or decrypt data using Data Encryption Standard
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
B<des>
|
||||
(
|
||||
B<-e>
|
||||
|
|
||||
B<-E>
|
||||
) | (
|
||||
B<-d>
|
||||
|
|
||||
B<-D>
|
||||
) | (
|
||||
B<->[B<cC>][B<ckname>]
|
||||
) |
|
||||
[
|
||||
B<-b3hfs>
|
||||
] [
|
||||
B<-k>
|
||||
I<key>
|
||||
]
|
||||
] [
|
||||
B<-u>[I<uuname>]
|
||||
[
|
||||
I<input-file>
|
||||
[
|
||||
I<output-file>
|
||||
] ]
|
||||
|
||||
=head1 NOTE
|
||||
|
||||
This page describes the B<des> stand-alone program, not the B<openssl des>
|
||||
command.
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
B<des>
|
||||
encrypts and decrypts data using the
|
||||
Data Encryption Standard algorithm.
|
||||
One of
|
||||
B<-e>, B<-E>
|
||||
(for encrypt) or
|
||||
B<-d>, B<-D>
|
||||
(for decrypt) must be specified.
|
||||
It is also possible to use
|
||||
B<-c>
|
||||
or
|
||||
B<-C>
|
||||
in conjunction or instead of the a encrypt/decrypt option to generate
|
||||
a 16 character hexadecimal checksum, generated via the
|
||||
I<des_cbc_cksum>.
|
||||
|
||||
Two standard encryption modes are supported by the
|
||||
B<des>
|
||||
program, Cipher Block Chaining (the default) and Electronic Code Book
|
||||
(specified with
|
||||
B<-b>).
|
||||
|
||||
The key used for the DES
|
||||
algorithm is obtained by prompting the user unless the
|
||||
B<-k>
|
||||
I<key>
|
||||
option is given.
|
||||
If the key is an argument to the
|
||||
B<des>
|
||||
command, it is potentially visible to users executing
|
||||
ps(1)
|
||||
or a derivative. To minimise this possibility,
|
||||
B<des>
|
||||
takes care to destroy the key argument immediately upon entry.
|
||||
If your shell keeps a history file be careful to make sure it is not
|
||||
world readable.
|
||||
|
||||
Since this program attempts to maintain compatibility with sunOS's
|
||||
des(1) command, there are 2 different methods used to convert the user
|
||||
supplied key to a des key.
|
||||
Whenever and one or more of
|
||||
B<-E>, B<-D>, B<-C>
|
||||
or
|
||||
B<-3>
|
||||
options are used, the key conversion procedure will not be compatible
|
||||
with the sunOS des(1) version but will use all the user supplied
|
||||
character to generate the des key.
|
||||
B<des>
|
||||
command reads from standard input unless
|
||||
I<input-file>
|
||||
is specified and writes to standard output unless
|
||||
I<output-file>
|
||||
is given.
|
||||
|
||||
=head1 OPTIONS
|
||||
|
||||
=over 4
|
||||
|
||||
=item B<-b>
|
||||
|
||||
Select ECB
|
||||
(eight bytes at a time) encryption mode.
|
||||
|
||||
=item B<-3>
|
||||
|
||||
Encrypt using triple encryption.
|
||||
By default triple cbc encryption is used but if the
|
||||
B<-b>
|
||||
option is used then triple ECB encryption is performed.
|
||||
If the key is less than 8 characters long, the flag has no effect.
|
||||
|
||||
=item B<-e>
|
||||
|
||||
Encrypt data using an 8 byte key in a manner compatible with sunOS
|
||||
des(1).
|
||||
|
||||
=item B<-E>
|
||||
|
||||
Encrypt data using a key of nearly unlimited length (1024 bytes).
|
||||
This will product a more secure encryption.
|
||||
|
||||
=item B<-d>
|
||||
|
||||
Decrypt data that was encrypted with the B<-e> option.
|
||||
|
||||
=item B<-D>
|
||||
|
||||
Decrypt data that was encrypted with the B<-E> option.
|
||||
|
||||
=item B<-c>
|
||||
|
||||
Generate a 16 character hexadecimal cbc checksum and output this to
|
||||
stderr.
|
||||
If a filename was specified after the
|
||||
B<-c>
|
||||
option, the checksum is output to that file.
|
||||
The checksum is generated using a key generated in a sunOS compatible
|
||||
manner.
|
||||
|
||||
=item B<-C>
|
||||
|
||||
A cbc checksum is generated in the same manner as described for the
|
||||
B<-c>
|
||||
option but the DES key is generated in the same manner as used for the
|
||||
B<-E>
|
||||
and
|
||||
B<-D>
|
||||
options
|
||||
|
||||
=item B<-f>
|
||||
|
||||
Does nothing - allowed for compatibility with sunOS des(1) command.
|
||||
|
||||
=item B<-s>
|
||||
|
||||
Does nothing - allowed for compatibility with sunOS des(1) command.
|
||||
|
||||
=item B<-k> I<key>
|
||||
|
||||
Use the encryption
|
||||
I<key>
|
||||
specified.
|
||||
|
||||
=item B<-h>
|
||||
|
||||
The
|
||||
I<key>
|
||||
is assumed to be a 16 character hexadecimal number.
|
||||
If the
|
||||
B<-3>
|
||||
option is used the key is assumed to be a 32 character hexadecimal
|
||||
number.
|
||||
|
||||
=item B<-u>
|
||||
|
||||
This flag is used to read and write uuencoded files. If decrypting,
|
||||
the input file is assumed to contain uuencoded, DES encrypted data.
|
||||
If encrypting, the characters following the B<-u> are used as the name of
|
||||
the uuencoded file to embed in the begin line of the uuencoded
|
||||
output. If there is no name specified after the B<-u>, the name text.des
|
||||
will be embedded in the header.
|
||||
|
||||
=back
|
||||
|
||||
=head1 SEE ALSO
|
||||
|
||||
ps(1),
|
||||
L<des_crypt(3)|des_crypt(3)>
|
||||
|
||||
=head1 BUGS
|
||||
|
||||
The problem with using the
|
||||
B<-e>
|
||||
option is the short key length.
|
||||
It would be better to use a real 56-bit key rather than an
|
||||
ASCII-based 56-bit pattern. Knowing that the key was derived from ASCII
|
||||
radically reduces the time necessary for a brute-force cryptographic attack.
|
||||
My attempt to remove this problem is to add an alternative text-key to
|
||||
DES-key function. This alternative function (accessed via
|
||||
B<-E>, B<-D>, B<-S>
|
||||
and
|
||||
B<-3>)
|
||||
uses DES to help generate the key.
|
||||
|
||||
Be carefully when using the B<-u> option. Doing B<des -ud> I<filename> will
|
||||
not decrypt filename (the B<-u> option will gobble the B<-d> option).
|
||||
|
||||
The VMS operating system operates in a world where files are always a
|
||||
multiple of 512 bytes. This causes problems when encrypted data is
|
||||
send from Unix to VMS since a 88 byte file will suddenly be padded
|
||||
with 424 null bytes. To get around this problem, use the B<-u> option
|
||||
to uuencode the data before it is send to the VMS system.
|
||||
|
||||
=head1 AUTHOR
|
||||
|
||||
Eric Young (eay@cryptsoft.com)
|
||||
|
||||
=cut
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
//
|
||||
// gettsc.inl
|
||||
//
|
||||
// gives access to the Pentium's (secret) cycle counter
|
||||
//
|
||||
// This software was written by Leonard Janke (janke@unixg.ubc.ca)
|
||||
// in 1996-7 and is entered, by him, into the public domain.
|
||||
|
||||
#if defined(__WATCOMC__)
|
||||
void GetTSC(unsigned long&);
|
||||
#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
|
||||
#elif defined(__GNUC__)
|
||||
inline
|
||||
void GetTSC(unsigned long& tsc)
|
||||
{
|
||||
asm volatile(".byte 15, 49\n\t"
|
||||
: "=eax" (tsc)
|
||||
:
|
||||
: "%edx", "%eax");
|
||||
}
|
||||
#elif defined(_MSC_VER)
|
||||
inline
|
||||
void GetTSC(unsigned long& tsc)
|
||||
{
|
||||
unsigned long a;
|
||||
__asm _emit 0fh
|
||||
__asm _emit 31h
|
||||
__asm mov a, eax;
|
||||
tsc=a;
|
||||
}
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <openssl/des.h>
|
||||
|
||||
void main(int argc,char *argv[])
|
||||
{
|
||||
des_key_schedule key1,key2,key3;
|
||||
unsigned long s1,s2,e1,e2;
|
||||
unsigned long data[2];
|
||||
int i,j;
|
||||
|
||||
for (j=0; j<6; j++)
|
||||
{
|
||||
for (i=0; i<1000; i++) /**/
|
||||
{
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
GetTSC(s1);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
GetTSC(e1);
|
||||
GetTSC(s2);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
GetTSC(e2);
|
||||
des_encrypt3(&data[0],key1,key2,key3);
|
||||
}
|
||||
|
||||
printf("des %d %d (%d)\n",
|
||||
e1-s1,e2-s2,((e2-s2)-(e1-s1)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,335 +0,0 @@
|
|||
/* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */
|
||||
|
||||
/*-
|
||||
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
|
||||
*
|
||||
* The function names in here are deprecated and are only present to
|
||||
* provide an interface compatible with libdes. OpenSSL now provides
|
||||
* functions where "des_" has been replaced with "DES_" in the names,
|
||||
* to make it possible to make incompatible changes that are needed
|
||||
* for C type security and other stuff.
|
||||
*
|
||||
* Please consider starting to use the DES_ functions rather than the
|
||||
* des_ ones. The des_ functions will dissapear completely before
|
||||
* OpenSSL 1.0!
|
||||
*
|
||||
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
|
||||
*/
|
||||
|
||||
/*
|
||||
* Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
|
||||
* 2001.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#define OPENSSL_DES_LIBDES_COMPATIBILITY
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/rand.h>
|
||||
|
||||
const char *_ossl_old_des_options(void)
|
||||
{
|
||||
return DES_options();
|
||||
}
|
||||
|
||||
void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output,
|
||||
des_key_schedule ks1, des_key_schedule ks2,
|
||||
des_key_schedule ks3, int enc)
|
||||
{
|
||||
DES_ecb3_encrypt((const_DES_cblock *)input, output,
|
||||
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
|
||||
(DES_key_schedule *)ks3, enc);
|
||||
}
|
||||
|
||||
DES_LONG _ossl_old_des_cbc_cksum(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec)
|
||||
{
|
||||
return DES_cbc_cksum((unsigned char *)input, output, length,
|
||||
(DES_key_schedule *)schedule, ivec);
|
||||
}
|
||||
|
||||
void _ossl_old_des_cbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc)
|
||||
{
|
||||
DES_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
|
||||
length, (DES_key_schedule *)schedule, ivec, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_ncbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc)
|
||||
{
|
||||
DES_ncbc_encrypt((unsigned char *)input, (unsigned char *)output,
|
||||
length, (DES_key_schedule *)schedule, ivec, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_xcbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec,
|
||||
_ossl_old_des_cblock *inw,
|
||||
_ossl_old_des_cblock *outw, int enc)
|
||||
{
|
||||
DES_xcbc_encrypt((unsigned char *)input, (unsigned char *)output,
|
||||
length, (DES_key_schedule *)schedule, ivec, inw, outw,
|
||||
enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_cfb_encrypt(unsigned char *in, unsigned char *out,
|
||||
int numbits, long length,
|
||||
des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc)
|
||||
{
|
||||
DES_cfb_encrypt(in, out, numbits, length,
|
||||
(DES_key_schedule *)schedule, ivec, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_ecb_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output,
|
||||
des_key_schedule ks, int enc)
|
||||
{
|
||||
DES_ecb_encrypt(input, output, (DES_key_schedule *)ks, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_encrypt(DES_LONG *data, des_key_schedule ks, int enc)
|
||||
{
|
||||
DES_encrypt1(data, (DES_key_schedule *)ks, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_encrypt2(DES_LONG *data, des_key_schedule ks, int enc)
|
||||
{
|
||||
DES_encrypt2(data, (DES_key_schedule *)ks, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_encrypt3(DES_LONG *data, des_key_schedule ks1,
|
||||
des_key_schedule ks2, des_key_schedule ks3)
|
||||
{
|
||||
DES_encrypt3(data, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
|
||||
(DES_key_schedule *)ks3);
|
||||
}
|
||||
|
||||
void _ossl_old_des_decrypt3(DES_LONG *data, des_key_schedule ks1,
|
||||
des_key_schedule ks2, des_key_schedule ks3)
|
||||
{
|
||||
DES_decrypt3(data, (DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
|
||||
(DES_key_schedule *)ks3);
|
||||
}
|
||||
|
||||
void _ossl_old_des_ede3_cbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
des_key_schedule ks1,
|
||||
des_key_schedule ks2,
|
||||
des_key_schedule ks3,
|
||||
_ossl_old_des_cblock *ivec, int enc)
|
||||
{
|
||||
DES_ede3_cbc_encrypt((unsigned char *)input, (unsigned char *)output,
|
||||
length, (DES_key_schedule *)ks1,
|
||||
(DES_key_schedule *)ks2, (DES_key_schedule *)ks3,
|
||||
ivec, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length, des_key_schedule ks1,
|
||||
des_key_schedule ks2,
|
||||
des_key_schedule ks3,
|
||||
_ossl_old_des_cblock *ivec, int *num,
|
||||
int enc)
|
||||
{
|
||||
DES_ede3_cfb64_encrypt(in, out, length,
|
||||
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
|
||||
(DES_key_schedule *)ks3, ivec, num, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length, des_key_schedule ks1,
|
||||
des_key_schedule ks2,
|
||||
des_key_schedule ks3,
|
||||
_ossl_old_des_cblock *ivec, int *num)
|
||||
{
|
||||
DES_ede3_ofb64_encrypt(in, out, length,
|
||||
(DES_key_schedule *)ks1, (DES_key_schedule *)ks2,
|
||||
(DES_key_schedule *)ks3, ivec, num);
|
||||
}
|
||||
|
||||
int _ossl_old_des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
|
||||
_ossl_old_des_cblock *iv)
|
||||
{
|
||||
return DES_enc_read(fd, buf, len, (DES_key_schedule *)sched, iv);
|
||||
}
|
||||
|
||||
int _ossl_old_des_enc_write(int fd, char *buf, int len,
|
||||
des_key_schedule sched, _ossl_old_des_cblock *iv)
|
||||
{
|
||||
return DES_enc_write(fd, buf, len, (DES_key_schedule *)sched, iv);
|
||||
}
|
||||
|
||||
char *_ossl_old_des_fcrypt(const char *buf, const char *salt, char *ret)
|
||||
{
|
||||
return DES_fcrypt(buf, salt, ret);
|
||||
}
|
||||
|
||||
char *_ossl_old_des_crypt(const char *buf, const char *salt)
|
||||
{
|
||||
return DES_crypt(buf, salt);
|
||||
}
|
||||
|
||||
char *_ossl_old_crypt(const char *buf, const char *salt)
|
||||
{
|
||||
return DES_crypt(buf, salt);
|
||||
}
|
||||
|
||||
void _ossl_old_des_ofb_encrypt(unsigned char *in, unsigned char *out,
|
||||
int numbits, long length,
|
||||
des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec)
|
||||
{
|
||||
DES_ofb_encrypt(in, out, numbits, length, (DES_key_schedule *)schedule,
|
||||
ivec);
|
||||
}
|
||||
|
||||
void _ossl_old_des_pcbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc)
|
||||
{
|
||||
DES_pcbc_encrypt((unsigned char *)input, (unsigned char *)output,
|
||||
length, (DES_key_schedule *)schedule, ivec, enc);
|
||||
}
|
||||
|
||||
DES_LONG _ossl_old_des_quad_cksum(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
int out_count, _ossl_old_des_cblock *seed)
|
||||
{
|
||||
return DES_quad_cksum((unsigned char *)input, output, length,
|
||||
out_count, seed);
|
||||
}
|
||||
|
||||
void _ossl_old_des_random_seed(_ossl_old_des_cblock key)
|
||||
{
|
||||
RAND_seed(key, sizeof(_ossl_old_des_cblock));
|
||||
}
|
||||
|
||||
void _ossl_old_des_random_key(_ossl_old_des_cblock ret)
|
||||
{
|
||||
DES_random_key((DES_cblock *)ret);
|
||||
}
|
||||
|
||||
int _ossl_old_des_read_password(_ossl_old_des_cblock *key, const char *prompt,
|
||||
int verify)
|
||||
{
|
||||
return DES_read_password(key, prompt, verify);
|
||||
}
|
||||
|
||||
int _ossl_old_des_read_2passwords(_ossl_old_des_cblock *key1,
|
||||
_ossl_old_des_cblock *key2,
|
||||
const char *prompt, int verify)
|
||||
{
|
||||
return DES_read_2passwords(key1, key2, prompt, verify);
|
||||
}
|
||||
|
||||
void _ossl_old_des_set_odd_parity(_ossl_old_des_cblock *key)
|
||||
{
|
||||
DES_set_odd_parity(key);
|
||||
}
|
||||
|
||||
int _ossl_old_des_is_weak_key(_ossl_old_des_cblock *key)
|
||||
{
|
||||
return DES_is_weak_key(key);
|
||||
}
|
||||
|
||||
int _ossl_old_des_set_key(_ossl_old_des_cblock *key,
|
||||
des_key_schedule schedule)
|
||||
{
|
||||
return DES_set_key(key, (DES_key_schedule *)schedule);
|
||||
}
|
||||
|
||||
int _ossl_old_des_key_sched(_ossl_old_des_cblock *key,
|
||||
des_key_schedule schedule)
|
||||
{
|
||||
return DES_key_sched(key, (DES_key_schedule *)schedule);
|
||||
}
|
||||
|
||||
void _ossl_old_des_string_to_key(char *str, _ossl_old_des_cblock *key)
|
||||
{
|
||||
DES_string_to_key(str, key);
|
||||
}
|
||||
|
||||
void _ossl_old_des_string_to_2keys(char *str, _ossl_old_des_cblock *key1,
|
||||
_ossl_old_des_cblock *key2)
|
||||
{
|
||||
DES_string_to_2keys(str, key1, key2);
|
||||
}
|
||||
|
||||
void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length, des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int *num,
|
||||
int enc)
|
||||
{
|
||||
DES_cfb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
|
||||
ivec, num, enc);
|
||||
}
|
||||
|
||||
void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length, des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int *num)
|
||||
{
|
||||
DES_ofb64_encrypt(in, out, length, (DES_key_schedule *)schedule,
|
||||
ivec, num);
|
||||
}
|
||||
|
|
@ -1,477 +0,0 @@
|
|||
/* crypto/des/des_old.h -*- mode:C; c-file-style: "eay" -*- */
|
||||
|
||||
/*-
|
||||
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
|
||||
*
|
||||
* The function names in here are deprecated and are only present to
|
||||
* provide an interface compatible with openssl 0.9.6 and older as
|
||||
* well as libdes. OpenSSL now provides functions where "des_" has
|
||||
* been replaced with "DES_" in the names, to make it possible to
|
||||
* make incompatible changes that are needed for C type security and
|
||||
* other stuff.
|
||||
*
|
||||
* This include files has two compatibility modes:
|
||||
*
|
||||
* - If OPENSSL_DES_LIBDES_COMPATIBILITY is defined, you get an API
|
||||
* that is compatible with libdes and SSLeay.
|
||||
* - If OPENSSL_DES_LIBDES_COMPATIBILITY isn't defined, you get an
|
||||
* API that is compatible with OpenSSL 0.9.5x to 0.9.6x.
|
||||
*
|
||||
* Note that these modes break earlier snapshots of OpenSSL, where
|
||||
* libdes compatibility was the only available mode or (later on) the
|
||||
* prefered compatibility mode. However, after much consideration
|
||||
* (and more or less violent discussions with external parties), it
|
||||
* was concluded that OpenSSL should be compatible with earlier versions
|
||||
* of itself before anything else. Also, in all honesty, libdes is
|
||||
* an old beast that shouldn't really be used any more.
|
||||
*
|
||||
* Please consider starting to use the DES_ functions rather than the
|
||||
* des_ ones. The des_ functions will disappear completely before
|
||||
* OpenSSL 1.0!
|
||||
*
|
||||
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
|
||||
*/
|
||||
|
||||
/*
|
||||
* Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
|
||||
* 2001.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef HEADER_DES_H
|
||||
# define HEADER_DES_H
|
||||
|
||||
# include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
|
||||
|
||||
# ifdef OPENSSL_NO_DES
|
||||
# error DES is disabled.
|
||||
# endif
|
||||
|
||||
# ifndef HEADER_NEW_DES_H
|
||||
# error You must include des.h, not des_old.h directly.
|
||||
# endif
|
||||
|
||||
# ifdef _KERBEROS_DES_H
|
||||
# error <openssl/des_old.h> replaces <kerberos/des.h>.
|
||||
# endif
|
||||
|
||||
# include <openssl/symhacks.h>
|
||||
|
||||
# ifdef OPENSSL_BUILD_SHLIBCRYPTO
|
||||
# undef OPENSSL_EXTERN
|
||||
# define OPENSSL_EXTERN OPENSSL_EXPORT
|
||||
# endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
# ifdef _
|
||||
# undef _
|
||||
# endif
|
||||
|
||||
typedef unsigned char _ossl_old_des_cblock[8];
|
||||
typedef struct _ossl_old_des_ks_struct {
|
||||
union {
|
||||
_ossl_old_des_cblock _;
|
||||
/*
|
||||
* make sure things are correct size on machines with 8 byte longs
|
||||
*/
|
||||
DES_LONG pad[2];
|
||||
} ks;
|
||||
} _ossl_old_des_key_schedule[16];
|
||||
|
||||
# ifndef OPENSSL_DES_LIBDES_COMPATIBILITY
|
||||
# define des_cblock DES_cblock
|
||||
# define const_des_cblock const_DES_cblock
|
||||
# define des_key_schedule DES_key_schedule
|
||||
# define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
|
||||
DES_ecb3_encrypt((i),(o),&(k1),&(k2),&(k3),(e))
|
||||
# define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
|
||||
DES_ede3_cbc_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(e))
|
||||
# define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
|
||||
DES_ede3_cfb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n),(e))
|
||||
# define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
|
||||
DES_ede3_ofb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n))
|
||||
# define des_options()\
|
||||
DES_options()
|
||||
# define des_cbc_cksum(i,o,l,k,iv)\
|
||||
DES_cbc_cksum((i),(o),(l),&(k),(iv))
|
||||
# define des_cbc_encrypt(i,o,l,k,iv,e)\
|
||||
DES_cbc_encrypt((i),(o),(l),&(k),(iv),(e))
|
||||
# define des_ncbc_encrypt(i,o,l,k,iv,e)\
|
||||
DES_ncbc_encrypt((i),(o),(l),&(k),(iv),(e))
|
||||
# define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
|
||||
DES_xcbc_encrypt((i),(o),(l),&(k),(iv),(inw),(outw),(e))
|
||||
# define des_cfb_encrypt(i,o,n,l,k,iv,e)\
|
||||
DES_cfb_encrypt((i),(o),(n),(l),&(k),(iv),(e))
|
||||
# define des_ecb_encrypt(i,o,k,e)\
|
||||
DES_ecb_encrypt((i),(o),&(k),(e))
|
||||
# define des_encrypt1(d,k,e)\
|
||||
DES_encrypt1((d),&(k),(e))
|
||||
# define des_encrypt2(d,k,e)\
|
||||
DES_encrypt2((d),&(k),(e))
|
||||
# define des_encrypt3(d,k1,k2,k3)\
|
||||
DES_encrypt3((d),&(k1),&(k2),&(k3))
|
||||
# define des_decrypt3(d,k1,k2,k3)\
|
||||
DES_decrypt3((d),&(k1),&(k2),&(k3))
|
||||
# define des_xwhite_in2out(k,i,o)\
|
||||
DES_xwhite_in2out((k),(i),(o))
|
||||
# define des_enc_read(f,b,l,k,iv)\
|
||||
DES_enc_read((f),(b),(l),&(k),(iv))
|
||||
# define des_enc_write(f,b,l,k,iv)\
|
||||
DES_enc_write((f),(b),(l),&(k),(iv))
|
||||
# define des_fcrypt(b,s,r)\
|
||||
DES_fcrypt((b),(s),(r))
|
||||
# define des_ofb_encrypt(i,o,n,l,k,iv)\
|
||||
DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv))
|
||||
# define des_pcbc_encrypt(i,o,l,k,iv,e)\
|
||||
DES_pcbc_encrypt((i),(o),(l),&(k),(iv),(e))
|
||||
# define des_quad_cksum(i,o,l,c,s)\
|
||||
DES_quad_cksum((i),(o),(l),(c),(s))
|
||||
# define des_random_seed(k)\
|
||||
_ossl_096_des_random_seed((k))
|
||||
# define des_random_key(r)\
|
||||
DES_random_key((r))
|
||||
# define des_read_password(k,p,v) \
|
||||
DES_read_password((k),(p),(v))
|
||||
# define des_read_2passwords(k1,k2,p,v) \
|
||||
DES_read_2passwords((k1),(k2),(p),(v))
|
||||
# define des_set_odd_parity(k)\
|
||||
DES_set_odd_parity((k))
|
||||
# define des_check_key_parity(k)\
|
||||
DES_check_key_parity((k))
|
||||
# define des_is_weak_key(k)\
|
||||
DES_is_weak_key((k))
|
||||
# define des_set_key(k,ks)\
|
||||
DES_set_key((k),&(ks))
|
||||
# define des_key_sched(k,ks)\
|
||||
DES_key_sched((k),&(ks))
|
||||
# define des_set_key_checked(k,ks)\
|
||||
DES_set_key_checked((k),&(ks))
|
||||
# define des_set_key_unchecked(k,ks)\
|
||||
DES_set_key_unchecked((k),&(ks))
|
||||
# define des_string_to_key(s,k)\
|
||||
DES_string_to_key((s),(k))
|
||||
# define des_string_to_2keys(s,k1,k2)\
|
||||
DES_string_to_2keys((s),(k1),(k2))
|
||||
# define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
|
||||
DES_cfb64_encrypt((i),(o),(l),&(ks),(iv),(n),(e))
|
||||
# define des_ofb64_encrypt(i,o,l,ks,iv,n)\
|
||||
DES_ofb64_encrypt((i),(o),(l),&(ks),(iv),(n))
|
||||
|
||||
# define des_ecb2_encrypt(i,o,k1,k2,e) \
|
||||
des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
|
||||
|
||||
# define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
|
||||
des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
|
||||
|
||||
# define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
|
||||
des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
|
||||
|
||||
# define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
|
||||
des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
|
||||
|
||||
# define des_check_key DES_check_key
|
||||
# define des_rw_mode DES_rw_mode
|
||||
# else /* libdes compatibility */
|
||||
/*
|
||||
* Map all symbol names to _ossl_old_des_* form, so we avoid all clashes with
|
||||
* libdes
|
||||
*/
|
||||
# define des_cblock _ossl_old_des_cblock
|
||||
# define des_key_schedule _ossl_old_des_key_schedule
|
||||
# define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
|
||||
_ossl_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e))
|
||||
# define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
|
||||
_ossl_old_des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(e))
|
||||
# define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
|
||||
_ossl_old_des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n),(e))
|
||||
# define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
|
||||
_ossl_old_des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n))
|
||||
# define des_options()\
|
||||
_ossl_old_des_options()
|
||||
# define des_cbc_cksum(i,o,l,k,iv)\
|
||||
_ossl_old_des_cbc_cksum((i),(o),(l),(k),(iv))
|
||||
# define des_cbc_encrypt(i,o,l,k,iv,e)\
|
||||
_ossl_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e))
|
||||
# define des_ncbc_encrypt(i,o,l,k,iv,e)\
|
||||
_ossl_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e))
|
||||
# define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
|
||||
_ossl_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e))
|
||||
# define des_cfb_encrypt(i,o,n,l,k,iv,e)\
|
||||
_ossl_old_des_cfb_encrypt((i),(o),(n),(l),(k),(iv),(e))
|
||||
# define des_ecb_encrypt(i,o,k,e)\
|
||||
_ossl_old_des_ecb_encrypt((i),(o),(k),(e))
|
||||
# define des_encrypt(d,k,e)\
|
||||
_ossl_old_des_encrypt((d),(k),(e))
|
||||
# define des_encrypt2(d,k,e)\
|
||||
_ossl_old_des_encrypt2((d),(k),(e))
|
||||
# define des_encrypt3(d,k1,k2,k3)\
|
||||
_ossl_old_des_encrypt3((d),(k1),(k2),(k3))
|
||||
# define des_decrypt3(d,k1,k2,k3)\
|
||||
_ossl_old_des_decrypt3((d),(k1),(k2),(k3))
|
||||
# define des_xwhite_in2out(k,i,o)\
|
||||
_ossl_old_des_xwhite_in2out((k),(i),(o))
|
||||
# define des_enc_read(f,b,l,k,iv)\
|
||||
_ossl_old_des_enc_read((f),(b),(l),(k),(iv))
|
||||
# define des_enc_write(f,b,l,k,iv)\
|
||||
_ossl_old_des_enc_write((f),(b),(l),(k),(iv))
|
||||
# define des_fcrypt(b,s,r)\
|
||||
_ossl_old_des_fcrypt((b),(s),(r))
|
||||
# define des_crypt(b,s)\
|
||||
_ossl_old_des_crypt((b),(s))
|
||||
# define des_ofb_encrypt(i,o,n,l,k,iv)\
|
||||
_ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
|
||||
# define des_pcbc_encrypt(i,o,l,k,iv,e)\
|
||||
_ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
|
||||
# define des_quad_cksum(i,o,l,c,s)\
|
||||
_ossl_old_des_quad_cksum((i),(o),(l),(c),(s))
|
||||
# define des_random_seed(k)\
|
||||
_ossl_old_des_random_seed((k))
|
||||
# define des_random_key(r)\
|
||||
_ossl_old_des_random_key((r))
|
||||
# define des_read_password(k,p,v) \
|
||||
_ossl_old_des_read_password((k),(p),(v))
|
||||
# define des_read_2passwords(k1,k2,p,v) \
|
||||
_ossl_old_des_read_2passwords((k1),(k2),(p),(v))
|
||||
# define des_set_odd_parity(k)\
|
||||
_ossl_old_des_set_odd_parity((k))
|
||||
# define des_is_weak_key(k)\
|
||||
_ossl_old_des_is_weak_key((k))
|
||||
# define des_set_key(k,ks)\
|
||||
_ossl_old_des_set_key((k),(ks))
|
||||
# define des_key_sched(k,ks)\
|
||||
_ossl_old_des_key_sched((k),(ks))
|
||||
# define des_string_to_key(s,k)\
|
||||
_ossl_old_des_string_to_key((s),(k))
|
||||
# define des_string_to_2keys(s,k1,k2)\
|
||||
_ossl_old_des_string_to_2keys((s),(k1),(k2))
|
||||
# define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
|
||||
_ossl_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e))
|
||||
# define des_ofb64_encrypt(i,o,l,ks,iv,n)\
|
||||
_ossl_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n))
|
||||
|
||||
# define des_ecb2_encrypt(i,o,k1,k2,e) \
|
||||
des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
|
||||
|
||||
# define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
|
||||
des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
|
||||
|
||||
# define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
|
||||
des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
|
||||
|
||||
# define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
|
||||
des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
|
||||
|
||||
# define des_check_key DES_check_key
|
||||
# define des_rw_mode DES_rw_mode
|
||||
# endif
|
||||
|
||||
const char *_ossl_old_des_options(void);
|
||||
void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output,
|
||||
_ossl_old_des_key_schedule ks1,
|
||||
_ossl_old_des_key_schedule ks2,
|
||||
_ossl_old_des_key_schedule ks3, int enc);
|
||||
DES_LONG _ossl_old_des_cbc_cksum(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec);
|
||||
void _ossl_old_des_cbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc);
|
||||
void _ossl_old_des_ncbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc);
|
||||
void _ossl_old_des_xcbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec,
|
||||
_ossl_old_des_cblock *inw,
|
||||
_ossl_old_des_cblock *outw, int enc);
|
||||
void _ossl_old_des_cfb_encrypt(unsigned char *in, unsigned char *out,
|
||||
int numbits, long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc);
|
||||
void _ossl_old_des_ecb_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output,
|
||||
_ossl_old_des_key_schedule ks, int enc);
|
||||
void _ossl_old_des_encrypt(DES_LONG *data, _ossl_old_des_key_schedule ks,
|
||||
int enc);
|
||||
void _ossl_old_des_encrypt2(DES_LONG *data, _ossl_old_des_key_schedule ks,
|
||||
int enc);
|
||||
void _ossl_old_des_encrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
|
||||
_ossl_old_des_key_schedule ks2,
|
||||
_ossl_old_des_key_schedule ks3);
|
||||
void _ossl_old_des_decrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
|
||||
_ossl_old_des_key_schedule ks2,
|
||||
_ossl_old_des_key_schedule ks3);
|
||||
void _ossl_old_des_ede3_cbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
_ossl_old_des_key_schedule ks1,
|
||||
_ossl_old_des_key_schedule ks2,
|
||||
_ossl_old_des_key_schedule ks3,
|
||||
_ossl_old_des_cblock *ivec, int enc);
|
||||
void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length,
|
||||
_ossl_old_des_key_schedule ks1,
|
||||
_ossl_old_des_key_schedule ks2,
|
||||
_ossl_old_des_key_schedule ks3,
|
||||
_ossl_old_des_cblock *ivec, int *num,
|
||||
int enc);
|
||||
void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length,
|
||||
_ossl_old_des_key_schedule ks1,
|
||||
_ossl_old_des_key_schedule ks2,
|
||||
_ossl_old_des_key_schedule ks3,
|
||||
_ossl_old_des_cblock *ivec, int *num);
|
||||
int _ossl_old_des_enc_read(int fd, char *buf, int len,
|
||||
_ossl_old_des_key_schedule sched,
|
||||
_ossl_old_des_cblock *iv);
|
||||
int _ossl_old_des_enc_write(int fd, char *buf, int len,
|
||||
_ossl_old_des_key_schedule sched,
|
||||
_ossl_old_des_cblock *iv);
|
||||
char *_ossl_old_des_fcrypt(const char *buf, const char *salt, char *ret);
|
||||
char *_ossl_old_des_crypt(const char *buf, const char *salt);
|
||||
# if !defined(PERL5)
|
||||
char *_ossl_old_crypt(const char *buf, const char *salt);
|
||||
# endif
|
||||
void _ossl_old_des_ofb_encrypt(unsigned char *in, unsigned char *out,
|
||||
int numbits, long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec);
|
||||
void _ossl_old_des_pcbc_encrypt(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int enc);
|
||||
DES_LONG _ossl_old_des_quad_cksum(_ossl_old_des_cblock *input,
|
||||
_ossl_old_des_cblock *output, long length,
|
||||
int out_count, _ossl_old_des_cblock *seed);
|
||||
void _ossl_old_des_random_seed(_ossl_old_des_cblock key);
|
||||
void _ossl_old_des_random_key(_ossl_old_des_cblock ret);
|
||||
int _ossl_old_des_read_password(_ossl_old_des_cblock *key, const char *prompt,
|
||||
int verify);
|
||||
int _ossl_old_des_read_2passwords(_ossl_old_des_cblock *key1,
|
||||
_ossl_old_des_cblock *key2,
|
||||
const char *prompt, int verify);
|
||||
void _ossl_old_des_set_odd_parity(_ossl_old_des_cblock *key);
|
||||
int _ossl_old_des_is_weak_key(_ossl_old_des_cblock *key);
|
||||
int _ossl_old_des_set_key(_ossl_old_des_cblock *key,
|
||||
_ossl_old_des_key_schedule schedule);
|
||||
int _ossl_old_des_key_sched(_ossl_old_des_cblock *key,
|
||||
_ossl_old_des_key_schedule schedule);
|
||||
void _ossl_old_des_string_to_key(char *str, _ossl_old_des_cblock *key);
|
||||
void _ossl_old_des_string_to_2keys(char *str, _ossl_old_des_cblock *key1,
|
||||
_ossl_old_des_cblock *key2);
|
||||
void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int *num,
|
||||
int enc);
|
||||
void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out,
|
||||
long length,
|
||||
_ossl_old_des_key_schedule schedule,
|
||||
_ossl_old_des_cblock *ivec, int *num);
|
||||
|
||||
void _ossl_096_des_random_seed(des_cblock *key);
|
||||
|
||||
/*
|
||||
* The following definitions provide compatibility with the MIT Kerberos
|
||||
* library. The _ossl_old_des_key_schedule structure is not binary
|
||||
* compatible.
|
||||
*/
|
||||
|
||||
# define _KERBEROS_DES_H
|
||||
|
||||
# define KRBDES_ENCRYPT DES_ENCRYPT
|
||||
# define KRBDES_DECRYPT DES_DECRYPT
|
||||
|
||||
# ifdef KERBEROS
|
||||
# define ENCRYPT DES_ENCRYPT
|
||||
# define DECRYPT DES_DECRYPT
|
||||
# endif
|
||||
|
||||
# ifndef NCOMPAT
|
||||
# define C_Block des_cblock
|
||||
# define Key_schedule des_key_schedule
|
||||
# define KEY_SZ DES_KEY_SZ
|
||||
# define string_to_key des_string_to_key
|
||||
# define read_pw_string des_read_pw_string
|
||||
# define random_key des_random_key
|
||||
# define pcbc_encrypt des_pcbc_encrypt
|
||||
# define set_key des_set_key
|
||||
# define key_sched des_key_sched
|
||||
# define ecb_encrypt des_ecb_encrypt
|
||||
# define cbc_encrypt des_cbc_encrypt
|
||||
# define ncbc_encrypt des_ncbc_encrypt
|
||||
# define xcbc_encrypt des_xcbc_encrypt
|
||||
# define cbc_cksum des_cbc_cksum
|
||||
# define quad_cksum des_quad_cksum
|
||||
# define check_parity des_check_key_parity
|
||||
# endif
|
||||
|
||||
# define des_fixup_key_parity DES_fixup_key_parity
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
/* for DES_read_pw_string et al */
|
||||
# include <openssl/ui_compat.h>
|
||||
|
||||
#endif
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
/* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */
|
||||
|
||||
/*
|
||||
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING The
|
||||
* function names in here are deprecated and are only present to provide an
|
||||
* interface compatible with OpenSSL 0.9.6c. OpenSSL now provides functions
|
||||
* where "des_" has been replaced with "DES_" in the names, to make it
|
||||
* possible to make incompatible changes that are needed for C type security
|
||||
* and other stuff. Please consider starting to use the DES_ functions
|
||||
* rather than the des_ ones. The des_ functions will dissapear completely
|
||||
* before OpenSSL 1.0! WARNING WARNING WARNING WARNING WARNING WARNING
|
||||
* WARNING WARNING
|
||||
*/
|
||||
|
||||
/*
|
||||
* Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
|
||||
* 2001.
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#undef OPENSSL_DES_LIBDES_COMPATIBILITY
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/rand.h>
|
||||
|
||||
void _ossl_096_des_random_seed(DES_cblock *key)
|
||||
{
|
||||
RAND_seed(key, sizeof(DES_cblock));
|
||||
}
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
//
|
||||
// gettsc.inl
|
||||
//
|
||||
// gives access to the Pentium's (secret) cycle counter
|
||||
//
|
||||
// This software was written by Leonard Janke (janke@unixg.ubc.ca)
|
||||
// in 1996-7 and is entered, by him, into the public domain.
|
||||
|
||||
#if defined(__WATCOMC__)
|
||||
void GetTSC(unsigned long&);
|
||||
#pragma aux GetTSC = 0x0f 0x31 "mov [edi], eax" parm [edi] modify [edx eax];
|
||||
#elif defined(__GNUC__)
|
||||
inline
|
||||
void GetTSC(unsigned long& tsc)
|
||||
{
|
||||
asm volatile(".byte 15, 49\n\t"
|
||||
: "=eax" (tsc)
|
||||
:
|
||||
: "%edx", "%eax");
|
||||
}
|
||||
#elif defined(_MSC_VER)
|
||||
inline
|
||||
void GetTSC(unsigned long& tsc)
|
||||
{
|
||||
unsigned long a;
|
||||
__asm _emit 0fh
|
||||
__asm _emit 31h
|
||||
__asm mov a, eax;
|
||||
tsc=a;
|
||||
}
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <openssl/des.h>
|
||||
|
||||
void main(int argc,char *argv[])
|
||||
{
|
||||
des_key_schedule key;
|
||||
unsigned long s1,s2,e1,e2;
|
||||
unsigned long data[2];
|
||||
int i,j;
|
||||
|
||||
for (j=0; j<6; j++)
|
||||
{
|
||||
for (i=0; i<1000; i++) /**/
|
||||
{
|
||||
des_encrypt1(&data[0],key,1);
|
||||
GetTSC(s1);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
GetTSC(e1);
|
||||
GetTSC(s2);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
GetTSC(e2);
|
||||
des_encrypt1(&data[0],key,1);
|
||||
}
|
||||
|
||||
printf("des %d %d (%d)\n",
|
||||
e1-s1,e2-s2,((e2-s2)-(e1-s1)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -357,8 +357,8 @@ int main(int argc, char *argv[])
|
|||
{
|
||||
int j, err = 0;
|
||||
unsigned int i;
|
||||
des_cblock in, out, outin, iv3;
|
||||
des_key_schedule ks, ks2, ks3;
|
||||
DES_cblock in, out, outin, iv3;
|
||||
DES_key_schedule ks, ks2, ks3;
|
||||
unsigned char cbc_in[40];
|
||||
unsigned char cbc_out[40];
|
||||
DES_LONG cs;
|
||||
|
|
@ -373,8 +373,8 @@ int main(int argc, char *argv[])
|
|||
memcpy(in, plain_data[i], 8);
|
||||
memset(out, 0, 8);
|
||||
memset(outin, 0, 8);
|
||||
des_ecb_encrypt(&in, &out, ks, DES_ENCRYPT);
|
||||
des_ecb_encrypt(&out, &outin, ks, DES_DECRYPT);
|
||||
DES_ecb_encrypt(&in, &out, &ks, DES_ENCRYPT);
|
||||
DES_ecb_encrypt(&out, &outin, &ks, DES_DECRYPT);
|
||||
|
||||
if (memcmp(out, cipher_data[i], 8) != 0) {
|
||||
printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
|
||||
|
|
@ -398,8 +398,8 @@ int main(int argc, char *argv[])
|
|||
memcpy(in, plain_data[i], 8);
|
||||
memset(out, 0, 8);
|
||||
memset(outin, 0, 8);
|
||||
des_ecb2_encrypt(&in, &out, ks, ks2, DES_ENCRYPT);
|
||||
des_ecb2_encrypt(&out, &outin, ks, ks2, DES_DECRYPT);
|
||||
DES_ecb3_encrypt(&in,&out,&ks,&ks2,&ks,DES_ENCRYPT);
|
||||
DES_ecb3_encrypt(&out,&outin,&ks,&ks2,&ks,DES_DECRYPT);
|
||||
|
||||
if (memcmp(out, cipher_ecb2[i], 8) != 0) {
|
||||
printf("Encryption error %2d\nk=%s p=%s o=%s act=%s\n",
|
||||
|
|
@ -423,7 +423,7 @@ int main(int argc, char *argv[])
|
|||
memset(cbc_out, 0, 40);
|
||||
memset(cbc_in, 0, 40);
|
||||
memcpy(iv3, cbc_iv, sizeof(cbc_iv));
|
||||
des_ncbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, ks,
|
||||
DES_ncbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, &ks,
|
||||
&iv3, DES_ENCRYPT);
|
||||
if (memcmp(cbc_out, cbc_ok, 32) != 0) {
|
||||
printf("cbc_encrypt encrypt error\n");
|
||||
|
|
@ -431,7 +431,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
memcpy(iv3, cbc_iv, sizeof(cbc_iv));
|
||||
des_ncbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, ks,
|
||||
DES_ncbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, &ks,
|
||||
&iv3, DES_DECRYPT);
|
||||
if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data)) != 0) {
|
||||
printf("cbc_encrypt decrypt error\n");
|
||||
|
|
@ -446,14 +446,14 @@ int main(int argc, char *argv[])
|
|||
memset(cbc_out, 0, 40);
|
||||
memset(cbc_in, 0, 40);
|
||||
memcpy(iv3, cbc_iv, sizeof(cbc_iv));
|
||||
des_xcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, ks,
|
||||
DES_xcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, &ks,
|
||||
&iv3, &cbc2_key, &cbc3_key, DES_ENCRYPT);
|
||||
if (memcmp(cbc_out, xcbc_ok, 32) != 0) {
|
||||
printf("des_xcbc_encrypt encrypt error\n");
|
||||
err = 1;
|
||||
}
|
||||
memcpy(iv3, cbc_iv, sizeof(cbc_iv));
|
||||
des_xcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, ks,
|
||||
DES_xcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, &ks,
|
||||
&iv3, &cbc2_key, &cbc3_key, DES_DECRYPT);
|
||||
if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data) + 1) != 0) {
|
||||
printf("des_xcbc_encrypt decrypt error\n");
|
||||
|
|
@ -480,10 +480,10 @@ int main(int argc, char *argv[])
|
|||
/* i=((i+7)/8)*8; */
|
||||
memcpy(iv3, cbc_iv, sizeof(cbc_iv));
|
||||
|
||||
des_ede3_cbc_encrypt(cbc_data, cbc_out, 16L, ks, ks2, ks3, &iv3,
|
||||
DES_ede3_cbc_encrypt(cbc_data, cbc_out, 16L, &ks, &ks2, &ks3, &iv3,
|
||||
DES_ENCRYPT);
|
||||
des_ede3_cbc_encrypt(&(cbc_data[16]), &(cbc_out[16]), i - 16, ks, ks2,
|
||||
ks3, &iv3, DES_ENCRYPT);
|
||||
DES_ede3_cbc_encrypt(&(cbc_data[16]), &(cbc_out[16]), i - 16, &ks, &ks2,
|
||||
&ks3, &iv3, DES_ENCRYPT);
|
||||
if (memcmp
|
||||
(cbc_out, cbc3_ok,
|
||||
(unsigned int)(strlen((char *)cbc_data) + 1 + 7) / 8 * 8) != 0) {
|
||||
|
|
@ -500,11 +500,11 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
memcpy(iv3, cbc_iv, sizeof(cbc_iv));
|
||||
des_ede3_cbc_encrypt(cbc_out, cbc_in, i, ks, ks2, ks3, &iv3, DES_DECRYPT);
|
||||
DES_ede3_cbc_encrypt(cbc_out, cbc_in, i, &ks, &ks2, &ks3, &iv3, DES_DECRYPT);
|
||||
if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data) + 1) != 0) {
|
||||
unsigned int n;
|
||||
|
||||
printf("des_ede3_cbc_encrypt decrypt error\n");
|
||||
printf("DES_ede3_cbc_encrypt decrypt error\n");
|
||||
for (n = 0; n < i; ++n)
|
||||
printf(" %02x", cbc_data[n]);
|
||||
printf("\n");
|
||||
|
|
@ -521,13 +521,13 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
memset(cbc_out, 0, 40);
|
||||
memset(cbc_in, 0, 40);
|
||||
des_pcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, ks,
|
||||
DES_pcbc_encrypt(cbc_data, cbc_out, strlen((char *)cbc_data) + 1, &ks,
|
||||
&cbc_iv, DES_ENCRYPT);
|
||||
if (memcmp(cbc_out, pcbc_ok, 32) != 0) {
|
||||
printf("pcbc_encrypt encrypt error\n");
|
||||
err = 1;
|
||||
}
|
||||
des_pcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, ks,
|
||||
DES_pcbc_encrypt(cbc_out, cbc_in, strlen((char *)cbc_data) + 1, &ks,
|
||||
&cbc_iv, DES_DECRYPT);
|
||||
if (memcmp(cbc_in, cbc_data, strlen((char *)cbc_data) + 1) != 0) {
|
||||
printf("pcbc_encrypt decrypt error\n");
|
||||
|
|
@ -551,8 +551,8 @@ int main(int argc, char *argv[])
|
|||
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
for (i = 0; i < sizeof(plain); i++)
|
||||
des_cfb_encrypt(&(plain[i]), &(cfb_buf1[i]),
|
||||
8, 1, ks, &cfb_tmp, DES_ENCRYPT);
|
||||
DES_cfb_encrypt(&(plain[i]), &(cfb_buf1[i]),
|
||||
8, 1, &ks, &cfb_tmp, DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher8, cfb_buf1, sizeof(plain)) != 0) {
|
||||
printf("cfb_encrypt small encrypt error\n");
|
||||
err = 1;
|
||||
|
|
@ -560,8 +560,8 @@ int main(int argc, char *argv[])
|
|||
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
for (i = 0; i < sizeof(plain); i++)
|
||||
des_cfb_encrypt(&(cfb_buf1[i]), &(cfb_buf2[i]),
|
||||
8, 1, ks, &cfb_tmp, DES_DECRYPT);
|
||||
DES_cfb_encrypt(&(cfb_buf1[i]), &(cfb_buf2[i]),
|
||||
8, 1, &ks, &cfb_tmp, DES_DECRYPT);
|
||||
if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
|
||||
printf("cfb_encrypt small decrypt error\n");
|
||||
err = 1;
|
||||
|
|
@ -575,7 +575,7 @@ int main(int argc, char *argv[])
|
|||
printf("Doing ofb\n");
|
||||
DES_set_key_checked(&ofb_key, &ks);
|
||||
memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
|
||||
des_ofb_encrypt(plain, ofb_buf1, 64, sizeof(plain) / 8, ks, &ofb_tmp);
|
||||
DES_ofb_encrypt(plain, ofb_buf1, 64, sizeof(plain) / 8, &ks, &ofb_tmp);
|
||||
if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
|
||||
printf("ofb_encrypt encrypt error\n");
|
||||
printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
|
||||
|
|
@ -589,7 +589,7 @@ int main(int argc, char *argv[])
|
|||
err = 1;
|
||||
}
|
||||
memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
|
||||
des_ofb_encrypt(ofb_buf1, ofb_buf2, 64, sizeof(ofb_buf1) / 8, ks,
|
||||
DES_ofb_encrypt(ofb_buf1, ofb_buf2, 64, sizeof(ofb_buf1) / 8, &ks,
|
||||
&ofb_tmp);
|
||||
if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
|
||||
printf("ofb_encrypt decrypt error\n");
|
||||
|
|
@ -610,7 +610,7 @@ int main(int argc, char *argv[])
|
|||
memset(ofb_buf2, 0, sizeof(ofb_buf1));
|
||||
num = 0;
|
||||
for (i = 0; i < sizeof(plain); i++) {
|
||||
des_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, ks, &ofb_tmp, &num);
|
||||
DES_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, &ks, &ofb_tmp, &num);
|
||||
}
|
||||
if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
|
||||
printf("ofb64_encrypt encrypt error\n");
|
||||
|
|
@ -618,7 +618,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
|
||||
num = 0;
|
||||
des_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), ks, &ofb_tmp,
|
||||
DES_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), &ks, &ofb_tmp,
|
||||
&num);
|
||||
if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
|
||||
printf("ofb64_encrypt decrypt error\n");
|
||||
|
|
@ -632,8 +632,8 @@ int main(int argc, char *argv[])
|
|||
memset(ofb_buf2, 0, sizeof(ofb_buf1));
|
||||
num = 0;
|
||||
for (i = 0; i < sizeof(plain); i++) {
|
||||
des_ede3_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, ks, ks,
|
||||
ks, &ofb_tmp, &num);
|
||||
DES_ede3_ofb64_encrypt(&(plain[i]), &(ofb_buf1[i]), 1, &ks, &ks,
|
||||
&ks, &ofb_tmp, &num);
|
||||
}
|
||||
if (memcmp(ofb_cipher, ofb_buf1, sizeof(ofb_buf1)) != 0) {
|
||||
printf("ede_ofb64_encrypt encrypt error\n");
|
||||
|
|
@ -641,7 +641,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
|
||||
num = 0;
|
||||
des_ede3_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), ks, ks, ks,
|
||||
DES_ede3_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), &ks, &ks, &ks,
|
||||
&ofb_tmp, &num);
|
||||
if (memcmp(plain, ofb_buf2, sizeof(ofb_buf2)) != 0) {
|
||||
printf("ede_ofb64_encrypt decrypt error\n");
|
||||
|
|
@ -650,7 +650,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
printf("Doing cbc_cksum\n");
|
||||
DES_set_key_checked(&cbc_key, &ks);
|
||||
cs = des_cbc_cksum(cbc_data, &cret, strlen((char *)cbc_data), ks,
|
||||
cs = DES_cbc_cksum(cbc_data, &cret, strlen((char *)cbc_data), &ks,
|
||||
&cbc_iv);
|
||||
if (cs != cbc_cksum_ret) {
|
||||
printf("bad return value (%08lX), should be %08lX\n",
|
||||
|
|
@ -663,9 +663,9 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
printf("Doing quad_cksum\n");
|
||||
cs = des_quad_cksum(cbc_data, (des_cblock *)lqret,
|
||||
cs = DES_quad_cksum(cbc_data, (DES_cblock *)lqret,
|
||||
(long)strlen((char *)cbc_data), 2,
|
||||
(des_cblock *)cbc_iv);
|
||||
(DES_cblock *)cbc_iv);
|
||||
if (cs != 0x70d7a63aL) {
|
||||
printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
|
||||
(unsigned long)cs);
|
||||
|
|
@ -696,15 +696,15 @@ int main(int argc, char *argv[])
|
|||
printf("input word alignment test");
|
||||
for (i = 0; i < 4; i++) {
|
||||
printf(" %d", i);
|
||||
des_ncbc_encrypt(&(cbc_out[i]), cbc_in,
|
||||
strlen((char *)cbc_data) + 1, ks,
|
||||
DES_ncbc_encrypt(&(cbc_out[i]), cbc_in,
|
||||
strlen((char *)cbc_data) + 1, &ks,
|
||||
&cbc_iv, DES_ENCRYPT);
|
||||
}
|
||||
printf("\noutput word alignment test");
|
||||
for (i = 0; i < 4; i++) {
|
||||
printf(" %d", i);
|
||||
des_ncbc_encrypt(cbc_out, &(cbc_in[i]),
|
||||
strlen((char *)cbc_data) + 1, ks,
|
||||
DES_ncbc_encrypt(cbc_out, &(cbc_in[i]),
|
||||
strlen((char *)cbc_data) + 1, &ks,
|
||||
&cbc_iv, DES_ENCRYPT);
|
||||
}
|
||||
printf("\n");
|
||||
|
|
@ -749,12 +749,12 @@ static char *pt(unsigned char *p)
|
|||
|
||||
static int cfb_test(int bits, unsigned char *cfb_cipher)
|
||||
{
|
||||
des_key_schedule ks;
|
||||
DES_key_schedule ks;
|
||||
int i, err = 0;
|
||||
|
||||
DES_set_key_checked(&cfb_key, &ks);
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
des_cfb_encrypt(plain, cfb_buf1, bits, sizeof(plain), ks, &cfb_tmp,
|
||||
DES_cfb_encrypt(plain, cfb_buf1, bits, sizeof(plain), &ks, &cfb_tmp,
|
||||
DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0) {
|
||||
err = 1;
|
||||
|
|
@ -763,7 +763,7 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
|
|||
printf("%s\n", pt(&(cfb_buf1[i])));
|
||||
}
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
des_cfb_encrypt(cfb_buf1, cfb_buf2, bits, sizeof(plain), ks, &cfb_tmp,
|
||||
DES_cfb_encrypt(cfb_buf1, cfb_buf2, bits, sizeof(plain), &ks, &cfb_tmp,
|
||||
DES_DECRYPT);
|
||||
if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
|
||||
err = 1;
|
||||
|
|
@ -776,14 +776,14 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
|
|||
|
||||
static int cfb64_test(unsigned char *cfb_cipher)
|
||||
{
|
||||
des_key_schedule ks;
|
||||
DES_key_schedule ks;
|
||||
int err = 0, i, n;
|
||||
|
||||
DES_set_key_checked(&cfb_key, &ks);
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
n = 0;
|
||||
des_cfb64_encrypt(plain, cfb_buf1, 12, ks, &cfb_tmp, &n, DES_ENCRYPT);
|
||||
des_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]), sizeof(plain) - 12, ks,
|
||||
DES_cfb64_encrypt(plain, cfb_buf1, 12, &ks, &cfb_tmp, &n, DES_ENCRYPT);
|
||||
DES_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]), sizeof(plain) - 12, &ks,
|
||||
&cfb_tmp, &n, DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0) {
|
||||
err = 1;
|
||||
|
|
@ -793,9 +793,9 @@ static int cfb64_test(unsigned char *cfb_cipher)
|
|||
}
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
n = 0;
|
||||
des_cfb64_encrypt(cfb_buf1, cfb_buf2, 17, ks, &cfb_tmp, &n, DES_DECRYPT);
|
||||
des_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
|
||||
sizeof(plain) - 17, ks, &cfb_tmp, &n, DES_DECRYPT);
|
||||
DES_cfb64_encrypt(cfb_buf1, cfb_buf2, 17, &ks, &cfb_tmp, &n, DES_DECRYPT);
|
||||
DES_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
|
||||
sizeof(plain) - 17, &ks, &cfb_tmp, &n, DES_DECRYPT);
|
||||
if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
|
||||
err = 1;
|
||||
printf("cfb_encrypt decrypt error\n");
|
||||
|
|
@ -807,16 +807,16 @@ static int cfb64_test(unsigned char *cfb_cipher)
|
|||
|
||||
static int ede_cfb64_test(unsigned char *cfb_cipher)
|
||||
{
|
||||
des_key_schedule ks;
|
||||
DES_key_schedule ks;
|
||||
int err = 0, i, n;
|
||||
|
||||
DES_set_key_checked(&cfb_key, &ks);
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
n = 0;
|
||||
des_ede3_cfb64_encrypt(plain, cfb_buf1, 12, ks, ks, ks, &cfb_tmp, &n,
|
||||
DES_ede3_cfb64_encrypt(plain, cfb_buf1, 12, &ks, &ks, &ks, &cfb_tmp, &n,
|
||||
DES_ENCRYPT);
|
||||
des_ede3_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]),
|
||||
sizeof(plain) - 12, ks, ks, ks,
|
||||
DES_ede3_cfb64_encrypt(&(plain[12]), &(cfb_buf1[12]),
|
||||
sizeof(plain) - 12, &ks, &ks, &ks,
|
||||
&cfb_tmp, &n, DES_ENCRYPT);
|
||||
if (memcmp(cfb_cipher, cfb_buf1, sizeof(plain)) != 0) {
|
||||
err = 1;
|
||||
|
|
@ -826,10 +826,10 @@ static int ede_cfb64_test(unsigned char *cfb_cipher)
|
|||
}
|
||||
memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
|
||||
n = 0;
|
||||
des_ede3_cfb64_encrypt(cfb_buf1, cfb_buf2, (long)17, ks, ks, ks,
|
||||
DES_ede3_cfb64_encrypt(cfb_buf1, cfb_buf2, (long)17, &ks, &ks, &ks,
|
||||
&cfb_tmp, &n, DES_DECRYPT);
|
||||
des_ede3_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
|
||||
sizeof(plain) - 17, ks, ks, ks,
|
||||
DES_ede3_cfb64_encrypt(&(cfb_buf1[17]), &(cfb_buf2[17]),
|
||||
sizeof(plain) - 17, &ks, &ks, &ks,
|
||||
&cfb_tmp, &n, DES_DECRYPT);
|
||||
if (memcmp(plain, cfb_buf2, sizeof(plain)) != 0) {
|
||||
err = 1;
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
#
|
||||
# Original BC Makefile from Teun <Teun.Nijssen@kub.nl>
|
||||
#
|
||||
#
|
||||
CC = bcc
|
||||
TLIB = tlib /0 /C
|
||||
# note: the -3 flag produces code for 386, 486, Pentium etc; omit it for 286s
|
||||
OPTIMIZE= -3 -O2
|
||||
#WINDOWS= -W
|
||||
CFLAGS = -c -ml -d $(OPTIMIZE) $(WINDOWS) -DMSDOS
|
||||
LFLAGS = -ml $(WINDOWS)
|
||||
|
||||
.c.obj:
|
||||
$(CC) $(CFLAGS) $*.c
|
||||
|
||||
.obj.exe:
|
||||
$(CC) $(LFLAGS) -e$*.exe $*.obj libdes.lib
|
||||
|
||||
all: $(LIB) destest.exe rpw.exe des.exe speed.exe
|
||||
|
||||
# "make clean": use a directory containing only libdes .exe and .obj files...
|
||||
clean:
|
||||
del *.exe
|
||||
del *.obj
|
||||
del libdes.lib
|
||||
del libdes.rsp
|
||||
|
||||
OBJS= cbc_cksm.obj cbc_enc.obj ecb_enc.obj pcbc_enc.obj \
|
||||
qud_cksm.obj rand_key.obj set_key.obj str2key.obj \
|
||||
enc_read.obj enc_writ.obj fcrypt.obj cfb_enc.obj \
|
||||
ecb3_enc.obj ofb_enc.obj cbc3_enc.obj read_pwd.obj\
|
||||
cfb64enc.obj ofb64enc.obj ede_enc.obj cfb64ede.obj\
|
||||
ofb64ede.obj supp.obj
|
||||
|
||||
LIB= libdes.lib
|
||||
|
||||
$(LIB): $(OBJS)
|
||||
del $(LIB)
|
||||
makersp "+%s &\n" &&|
|
||||
$(OBJS)
|
||||
| >libdes.rsp
|
||||
$(TLIB) libdes.lib @libdes.rsp,nul
|
||||
del libdes.rsp
|
||||
|
||||
destest.exe: destest.obj libdes.lib
|
||||
rpw.exe: rpw.obj libdes.lib
|
||||
speed.exe: speed.obj libdes.lib
|
||||
des.exe: des.obj libdes.lib
|
||||
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
Note that the UNROLL option makes the 'inner' des loop unroll all 16 rounds
|
||||
instead of the default 4.
|
||||
RISC1 and RISC2 are 2 alternatives for the inner loop and
|
||||
PTR means to use pointers arithmatic instead of arrays.
|
||||
|
||||
FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - assembler 577,000 4620k/s
|
||||
IRIX 6.2 - R10000 195mhz - cc (-O3 -n32) - UNROLL RISC2 PTR 496,000 3968k/s
|
||||
solaris 2.5.1 usparc 167mhz?? - SC4.0 - UNROLL RISC1 PTR [1] 459,400 3672k/s
|
||||
FreeBSD - Pentium Pro 200mhz - gcc 2.7.2.2 - UNROLL RISC1 433,000 3468k/s
|
||||
solaris 2.5.1 usparc 167mhz?? - gcc 2.7.2 - UNROLL 380,000 3041k/s
|
||||
linux - pentium 100mhz - gcc 2.7.0 - assembler 281,000 2250k/s
|
||||
NT 4.0 - pentium 100mhz - VC 4.2 - assembler 281,000 2250k/s
|
||||
AIX 4.1? - PPC604 100mhz - cc - UNROLL 275,000 2200k/s
|
||||
IRIX 5.3 - R4400 200mhz - gcc 2.6.3 - UNROLL RISC2 PTR 235,300 1882k/s
|
||||
IRIX 5.3 - R4400 200mhz - cc - UNROLL RISC2 PTR 233,700 1869k/s
|
||||
NT 4.0 - pentium 100mhz - VC 4.2 - UNROLL RISC1 PTR 191,000 1528k/s
|
||||
DEC Alpha 165mhz?? - cc - RISC2 PTR [2] 181,000 1448k/s
|
||||
linux - pentium 100mhz - gcc 2.7.0 - UNROLL RISC1 PTR 158,500 1268k/s
|
||||
HPUX 10 - 9000/887 - cc - UNROLL [3] 148,000 1190k/s
|
||||
solaris 2.5.1 - sparc 10 50mhz - gcc 2.7.2 - UNROLL 123,600 989k/s
|
||||
IRIX 5.3 - R4000 100mhz - cc - UNROLL RISC2 PTR 101,000 808k/s
|
||||
DGUX - 88100 50mhz(?) - gcc 2.6.3 - UNROLL 81,000 648k/s
|
||||
solaris 2.4 486 50mhz - gcc 2.6.3 - assembler 65,000 522k/s
|
||||
HPUX 10 - 9000/887 - k&r cc (default compiler) - UNROLL PTR 76,000 608k/s
|
||||
solaris 2.4 486 50mhz - gcc 2.6.3 - UNROLL RISC2 43,500 344k/s
|
||||
AIX - old slow one :-) - cc - 39,000 312k/s
|
||||
|
||||
Notes.
|
||||
[1] For the ultra sparc, SunC 4.0
|
||||
cc -xtarget=ultra -xarch=v8plus -Xa -xO5, running 'des_opts'
|
||||
gives a speed of 344,000 des/s while 'speed' gives 459,000 des/s.
|
||||
I'll record the higher since it is coming from the library but it
|
||||
is all rather weird.
|
||||
[2] Similar to the ultra sparc ([1]), 181,000 for 'des_opts' vs 175,000.
|
||||
[3] I was unable to get access to this machine when it was not heavily loaded.
|
||||
As such, my timing program was never able to get more that %30 of the CPU.
|
||||
This would cause the program to give much lower speed numbers because
|
||||
it would be 'fighting' to stay in the cache with the other CPU burning
|
||||
processes.
|
||||
|
|
@ -1,493 +0,0 @@
|
|||
/* crypto/des/read_pwd.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 <openssl/e_os2.h>
|
||||
#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WIN32)
|
||||
# ifdef OPENSSL_UNISTD
|
||||
# include OPENSSL_UNISTD
|
||||
# else
|
||||
# include <unistd.h>
|
||||
# endif
|
||||
/*
|
||||
* If unistd.h defines _POSIX_VERSION, we conclude that we are on a POSIX
|
||||
* system and have sigaction and termios.
|
||||
*/
|
||||
# if defined(_POSIX_VERSION)
|
||||
|
||||
# define SIGACTION
|
||||
# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
|
||||
# define TERMIOS
|
||||
# endif
|
||||
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Define this if you have sigaction() */
|
||||
/* #define SIGACTION */
|
||||
|
||||
/* 06-Apr-92 Luke Brennan Support for VMS */
|
||||
#include "des_locl.h"
|
||||
#include "cryptlib.h"
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <setjmp.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */
|
||||
# include <starlet.h>
|
||||
# ifdef __DECC
|
||||
# pragma message disable DOLLARID
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef WIN_CONSOLE_BUG
|
||||
# include <windows.h>
|
||||
# ifndef OPENSSL_SYS_WINCE
|
||||
# include <wincon.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* There are 5 types of terminal interface supported, TERMIO, TERMIOS, VMS,
|
||||
* MSDOS and SGTTY
|
||||
*/
|
||||
|
||||
#if defined(__sgi) && !defined(TERMIOS)
|
||||
# define TERMIOS
|
||||
# undef TERMIO
|
||||
# undef SGTTY
|
||||
#endif
|
||||
|
||||
#if defined(linux) && !defined(TERMIO)
|
||||
# undef TERMIOS
|
||||
# define TERMIO
|
||||
# undef SGTTY
|
||||
#endif
|
||||
|
||||
#ifdef _LIBC
|
||||
# undef TERMIOS
|
||||
# define TERMIO
|
||||
# undef SGTTY
|
||||
#endif
|
||||
|
||||
#if !defined(TERMIO) && !defined(TERMIOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_MSDOS)
|
||||
# undef TERMIOS
|
||||
# undef TERMIO
|
||||
# define SGTTY
|
||||
#endif
|
||||
|
||||
#if defined(OPENSSL_SYS_VXWORKS)
|
||||
# undef TERMIOS
|
||||
# undef TERMIO
|
||||
# undef SGTTY
|
||||
#endif
|
||||
|
||||
#ifdef TERMIOS
|
||||
# include <termios.h>
|
||||
# define TTY_STRUCT struct termios
|
||||
# define TTY_FLAGS c_lflag
|
||||
# define TTY_get(tty,data) tcgetattr(tty,data)
|
||||
# define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data)
|
||||
#endif
|
||||
|
||||
#ifdef TERMIO
|
||||
# include <termio.h>
|
||||
# define TTY_STRUCT struct termio
|
||||
# define TTY_FLAGS c_lflag
|
||||
# define TTY_get(tty,data) ioctl(tty,TCGETA,data)
|
||||
# define TTY_set(tty,data) ioctl(tty,TCSETA,data)
|
||||
#endif
|
||||
|
||||
#ifdef SGTTY
|
||||
# include <sgtty.h>
|
||||
# define TTY_STRUCT struct sgttyb
|
||||
# define TTY_FLAGS sg_flags
|
||||
# define TTY_get(tty,data) ioctl(tty,TIOCGETP,data)
|
||||
# define TTY_set(tty,data) ioctl(tty,TIOCSETP,data)
|
||||
#endif
|
||||
|
||||
#if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS)
|
||||
# include <sys/ioctl.h>
|
||||
#endif
|
||||
|
||||
#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WINCE)
|
||||
# include <conio.h>
|
||||
# define fgets(a,b,c) noecho_fgets(a,b,c)
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_SYS_VMS
|
||||
# include <ssdef.h>
|
||||
# include <iodef.h>
|
||||
# include <ttdef.h>
|
||||
# include <descrip.h>
|
||||
struct IOSB {
|
||||
short iosb$w_value;
|
||||
short iosb$w_count;
|
||||
long iosb$l_info;
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifndef NX509_SIG
|
||||
# define NX509_SIG 32
|
||||
#endif
|
||||
|
||||
static void read_till_nl(FILE *);
|
||||
static void recsig(int);
|
||||
static void pushsig(void);
|
||||
static void popsig(void);
|
||||
#if defined(OPENSSL_SYS_MSDOS)
|
||||
static int noecho_fgets(char *buf, int size, FILE *tty);
|
||||
#endif
|
||||
#ifdef SIGACTION
|
||||
static struct sigaction savsig[NX509_SIG];
|
||||
#else
|
||||
static void (*savsig[NX509_SIG]) (int);
|
||||
#endif
|
||||
static jmp_buf save;
|
||||
|
||||
int des_read_pw_string(char *buf, int length, const char *prompt, int verify)
|
||||
{
|
||||
char buff[BUFSIZ];
|
||||
int ret;
|
||||
|
||||
ret =
|
||||
des_read_pw(buf, buff, (length > BUFSIZ) ? BUFSIZ : length, prompt,
|
||||
verify);
|
||||
OPENSSL_cleanse(buff, BUFSIZ);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
#ifdef OPENSSL_SYS_WINCE
|
||||
|
||||
int des_read_pw(char *buf, char *buff, int size, const char *prompt,
|
||||
int verify)
|
||||
{
|
||||
memset(buf, 0, size);
|
||||
memset(buff, 0, size);
|
||||
return (0);
|
||||
}
|
||||
|
||||
#else /* !OPENSSL_SYS_WINCE */
|
||||
|
||||
static void read_till_nl(FILE *in)
|
||||
{
|
||||
# define SIZE 4
|
||||
char buf[SIZE + 1];
|
||||
|
||||
do {
|
||||
fgets(buf, SIZE, in);
|
||||
} while (strchr(buf, '\n') == NULL);
|
||||
}
|
||||
|
||||
/* return 0 if ok, 1 (or -1) otherwise */
|
||||
int des_read_pw(char *buf, char *buff, int size, const char *prompt,
|
||||
int verify)
|
||||
{
|
||||
# ifdef OPENSSL_SYS_VMS
|
||||
struct IOSB iosb;
|
||||
$DESCRIPTOR(terminal, "TT");
|
||||
long tty_orig[3], tty_new[3];
|
||||
long status;
|
||||
unsigned short channel = 0;
|
||||
# else
|
||||
# if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
|
||||
TTY_STRUCT tty_orig, tty_new;
|
||||
# endif
|
||||
# endif
|
||||
int number;
|
||||
int ok;
|
||||
/*
|
||||
* statics are simply to avoid warnings about longjmp clobbering things
|
||||
*/
|
||||
static int ps;
|
||||
int is_a_tty;
|
||||
static FILE *tty;
|
||||
char *p;
|
||||
|
||||
if (setjmp(save)) {
|
||||
ok = 0;
|
||||
goto error;
|
||||
}
|
||||
|
||||
number = 5;
|
||||
ok = 0;
|
||||
ps = 0;
|
||||
is_a_tty = 1;
|
||||
tty = NULL;
|
||||
|
||||
# ifdef OPENSSL_SYS_MSDOS
|
||||
if ((tty = fopen("con", "r")) == NULL)
|
||||
tty = stdin;
|
||||
# elif defined(OPENSSL_SYS_VXWORKS)
|
||||
tty = stdin;
|
||||
# else
|
||||
if ((tty = fopen("/dev/tty", "r")) == NULL)
|
||||
tty = stdin;
|
||||
# endif
|
||||
|
||||
# if defined(TTY_get) && !defined(OPENSSL_SYS_VMS)
|
||||
if (TTY_get(fileno(tty), &tty_orig) == -1) {
|
||||
# ifdef ENOTTY
|
||||
if (errno == ENOTTY)
|
||||
is_a_tty = 0;
|
||||
else
|
||||
# endif
|
||||
# ifdef EINVAL
|
||||
/*
|
||||
* Ariel Glenn ariel@columbia.edu reports that solaris can return
|
||||
* EINVAL instead. This should be ok
|
||||
*/
|
||||
if (errno == EINVAL)
|
||||
is_a_tty = 0;
|
||||
else
|
||||
# endif
|
||||
return (-1);
|
||||
}
|
||||
memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig));
|
||||
# endif
|
||||
# ifdef OPENSSL_SYS_VMS
|
||||
status = sys$assign(&terminal, &channel, 0, 0);
|
||||
if (status != SS$_NORMAL)
|
||||
return (-1);
|
||||
status =
|
||||
sys$qiow(0, channel, IO$_SENSEMODE, &iosb, 0, 0, tty_orig, 12, 0, 0,
|
||||
0, 0);
|
||||
if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL))
|
||||
return (-1);
|
||||
# endif
|
||||
|
||||
pushsig();
|
||||
ps = 1;
|
||||
|
||||
# ifdef TTY_FLAGS
|
||||
tty_new.TTY_FLAGS &= ~ECHO;
|
||||
# endif
|
||||
|
||||
# if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
|
||||
if (is_a_tty && (TTY_set(fileno(tty), &tty_new) == -1))
|
||||
return (-1);
|
||||
# endif
|
||||
# ifdef OPENSSL_SYS_VMS
|
||||
tty_new[0] = tty_orig[0];
|
||||
tty_new[1] = tty_orig[1] | TT$M_NOECHO;
|
||||
tty_new[2] = tty_orig[2];
|
||||
status =
|
||||
sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_new, 12, 0, 0, 0,
|
||||
0);
|
||||
if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL))
|
||||
return (-1);
|
||||
# endif
|
||||
ps = 2;
|
||||
|
||||
while ((!ok) && (number--)) {
|
||||
fputs(prompt, stderr);
|
||||
fflush(stderr);
|
||||
|
||||
buf[0] = '\0';
|
||||
fgets(buf, size, tty);
|
||||
if (feof(tty))
|
||||
goto error;
|
||||
if (ferror(tty))
|
||||
goto error;
|
||||
if ((p = (char *)strchr(buf, '\n')) != NULL)
|
||||
*p = '\0';
|
||||
else
|
||||
read_till_nl(tty);
|
||||
if (verify) {
|
||||
fprintf(stderr, "\nVerifying password - %s", prompt);
|
||||
fflush(stderr);
|
||||
buff[0] = '\0';
|
||||
fgets(buff, size, tty);
|
||||
if (feof(tty))
|
||||
goto error;
|
||||
if ((p = (char *)strchr(buff, '\n')) != NULL)
|
||||
*p = '\0';
|
||||
else
|
||||
read_till_nl(tty);
|
||||
|
||||
if (strcmp(buf, buff) != 0) {
|
||||
fprintf(stderr, "\nVerify failure");
|
||||
fflush(stderr);
|
||||
break;
|
||||
/* continue; */
|
||||
}
|
||||
}
|
||||
ok = 1;
|
||||
}
|
||||
|
||||
error:
|
||||
fprintf(stderr, "\n");
|
||||
/* What can we do if there is an error? */
|
||||
# if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
|
||||
if (ps >= 2)
|
||||
TTY_set(fileno(tty), &tty_orig);
|
||||
# endif
|
||||
# ifdef OPENSSL_SYS_VMS
|
||||
if (ps >= 2)
|
||||
status =
|
||||
sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_orig, 12, 0, 0,
|
||||
0, 0);
|
||||
# endif
|
||||
|
||||
if (ps >= 1)
|
||||
popsig();
|
||||
if (stdin != tty)
|
||||
fclose(tty);
|
||||
# ifdef OPENSSL_SYS_VMS
|
||||
status = sys$dassgn(channel);
|
||||
# endif
|
||||
return (!ok);
|
||||
}
|
||||
|
||||
static void pushsig(void)
|
||||
{
|
||||
int i;
|
||||
# ifdef SIGACTION
|
||||
struct sigaction sa;
|
||||
|
||||
memset(&sa, 0, sizeof sa);
|
||||
sa.sa_handler = recsig;
|
||||
# endif
|
||||
|
||||
for (i = 1; i < NX509_SIG; i++) {
|
||||
# ifdef SIGUSR1
|
||||
if (i == SIGUSR1)
|
||||
continue;
|
||||
# endif
|
||||
# ifdef SIGUSR2
|
||||
if (i == SIGUSR2)
|
||||
continue;
|
||||
# endif
|
||||
# ifdef SIGACTION
|
||||
sigaction(i, &sa, &savsig[i]);
|
||||
# else
|
||||
savsig[i] = signal(i, recsig);
|
||||
# endif
|
||||
}
|
||||
|
||||
# ifdef SIGWINCH
|
||||
signal(SIGWINCH, SIG_DFL);
|
||||
# endif
|
||||
}
|
||||
|
||||
static void popsig(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 1; i < NX509_SIG; i++) {
|
||||
# ifdef SIGUSR1
|
||||
if (i == SIGUSR1)
|
||||
continue;
|
||||
# endif
|
||||
# ifdef SIGUSR2
|
||||
if (i == SIGUSR2)
|
||||
continue;
|
||||
# endif
|
||||
# ifdef SIGACTION
|
||||
sigaction(i, &savsig[i], NULL);
|
||||
# else
|
||||
signal(i, savsig[i]);
|
||||
# endif
|
||||
}
|
||||
}
|
||||
|
||||
static void recsig(int i)
|
||||
{
|
||||
longjmp(save, 1);
|
||||
}
|
||||
|
||||
# ifdef OPENSSL_SYS_MSDOS
|
||||
static int noecho_fgets(char *buf, int size, FILE *tty)
|
||||
{
|
||||
int i;
|
||||
char *p;
|
||||
|
||||
p = buf;
|
||||
for (;;) {
|
||||
if (size == 0) {
|
||||
*p = '\0';
|
||||
break;
|
||||
}
|
||||
size--;
|
||||
i = getch();
|
||||
if (i == '\r')
|
||||
i = '\n';
|
||||
*(p++) = i;
|
||||
if (i == '\n') {
|
||||
*p = '\0';
|
||||
break;
|
||||
}
|
||||
}
|
||||
# ifdef WIN_CONSOLE_BUG
|
||||
/*
|
||||
* Win95 has several evil console bugs: one of these is that the last
|
||||
* character read using getch() is passed to the next read: this is
|
||||
* usually a CR so this can be trouble. No STDIO fix seems to work but
|
||||
* flushing the console appears to do the trick.
|
||||
*/
|
||||
{
|
||||
HANDLE inh;
|
||||
inh = GetStdHandle(STD_INPUT_HANDLE);
|
||||
FlushConsoleInputBuffer(inh);
|
||||
}
|
||||
# endif
|
||||
return (strlen(buf));
|
||||
}
|
||||
# endif
|
||||
#endif /* !OPENSSL_SYS_WINCE */
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
/* crypto/des/rpw.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/des.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
DES_cblock k, k1;
|
||||
int i;
|
||||
|
||||
printf("read passwd\n");
|
||||
if ((i = des_read_password(&k, "Enter password:", 0)) == 0) {
|
||||
printf("password = ");
|
||||
for (i = 0; i < 8; i++)
|
||||
printf("%02x ", k[i]);
|
||||
} else
|
||||
printf("error %d\n", i);
|
||||
printf("\n");
|
||||
printf("read 2passwds and verify\n");
|
||||
if ((i = des_read_2passwords(&k, &k1,
|
||||
"Enter verified password:", 1)) == 0) {
|
||||
printf("password1 = ");
|
||||
for (i = 0; i < 8; i++)
|
||||
printf("%02x ", k[i]);
|
||||
printf("\n");
|
||||
printf("password2 = ");
|
||||
for (i = 0; i < 8; i++)
|
||||
printf("%02x ", k1[i]);
|
||||
printf("\n");
|
||||
return (1);
|
||||
}
|
||||
printf("error %d\n", i);
|
||||
return (0);
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#!./perl
|
||||
|
||||
BEGIN { push(@INC, qw(../../../lib ../../lib ../lib lib)); }
|
||||
|
||||
use DES;
|
||||
|
||||
$key='00000000';
|
||||
$ks=DES::set_key($key);
|
||||
@a=split(//,$ks);
|
||||
foreach (@a) { printf "%02x-",ord($_); }
|
||||
print "\n";
|
||||
|
||||
|
||||
$key=DES::random_key();
|
||||
print "($_)\n";
|
||||
@a=split(//,$key);
|
||||
foreach (@a) { printf "%02x-",ord($_); }
|
||||
print "\n";
|
||||
$str="this is and again into the breach";
|
||||
($k1,$k2)=DES::string_to_2keys($str);
|
||||
@a=split(//,$k1);
|
||||
foreach (@a) { printf "%02x-",ord($_); }
|
||||
print "\n";
|
||||
@a=split(//,$k2);
|
||||
foreach (@a) { printf "%02x-",ord($_); }
|
||||
print "\n";
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Solaris 2.4, 486 50mhz, gcc 2.6.3
|
||||
options des ecb/s
|
||||
16 r2 i 43552.51 100.0%
|
||||
16 r1 i 43487.45 99.9%
|
||||
16 c p 43003.23 98.7%
|
||||
16 r2 p 42339.00 97.2%
|
||||
16 c i 41900.91 96.2%
|
||||
16 r1 p 41360.64 95.0%
|
||||
4 c i 38728.48 88.9%
|
||||
4 c p 38225.63 87.8%
|
||||
4 r1 i 38085.79 87.4%
|
||||
4 r2 i 37825.64 86.9%
|
||||
4 r2 p 34611.00 79.5%
|
||||
4 r1 p 31802.00 73.0%
|
||||
-DDES_UNROLL -DDES_RISC2
|
||||
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
Pentium 100
|
||||
Linux 2 kernel
|
||||
gcc 2.7.0 -O3 -fomit-frame-pointer
|
||||
No X server running, just a console, it makes the top speed jump from 151,000
|
||||
to 158,000 :-).
|
||||
options des ecb/s
|
||||
assember 281000.00 177.1%
|
||||
16 r1 p 158667.40 100.0%
|
||||
16 r1 i 148471.70 93.6%
|
||||
16 r2 p 143961.80 90.7%
|
||||
16 r2 i 141689.20 89.3%
|
||||
4 r1 i 140100.00 88.3%
|
||||
4 r2 i 134049.40 84.5%
|
||||
16 c i 124145.20 78.2%
|
||||
16 c p 121584.20 76.6%
|
||||
4 c i 118116.00 74.4%
|
||||
4 r2 p 117977.90 74.4%
|
||||
4 c p 114971.40 72.5%
|
||||
4 r1 p 114578.40 72.2%
|
||||
-DDES_UNROLL -DDES_RISC1 -DDES_PTR
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
Pentium 100
|
||||
Free BSD 2.1.5 kernel
|
||||
gcc 2.7.2.2 -O3 -fomit-frame-pointer
|
||||
options des ecb/s
|
||||
assember 578000.00 133.1%
|
||||
16 r2 i 434454.80 100.0%
|
||||
16 r1 i 433621.43 99.8%
|
||||
16 r2 p 431375.69 99.3%
|
||||
4 r1 i 423722.30 97.5%
|
||||
4 r2 i 422399.40 97.2%
|
||||
16 r1 p 421739.40 97.1%
|
||||
16 c i 399027.94 91.8%
|
||||
16 c p 372251.70 85.7%
|
||||
4 c i 365118.35 84.0%
|
||||
4 c p 352880.51 81.2%
|
||||
4 r2 p 255104.90 58.7%
|
||||
4 r1 p 251289.18 57.8%
|
||||
-DDES_UNROLL -DDES_RISC2
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From: Paco Garcia <pgarcia@cam.es>
|
||||
|
||||
This machine is a Bull Estrella Minitower Model MT604-100
|
||||
Processor : PPC604
|
||||
P.Speed : 100Mhz
|
||||
Data/Instr Cache : 16 K
|
||||
L2 Cache : 256 K
|
||||
PCI BUS Speed : 33 Mhz
|
||||
TransfRate PCI : 132 MB/s
|
||||
Memory : 96 MB
|
||||
|
||||
options des ecb/s
|
||||
4 c p 275118.61 100.0%
|
||||
4 c i 273545.07 99.4%
|
||||
4 r2 p 270441.02 98.3%
|
||||
4 r1 p 253052.15 92.0%
|
||||
4 r2 i 240842.97 87.5%
|
||||
4 r1 i 240556.66 87.4%
|
||||
16 c i 224603.99 81.6%
|
||||
16 c p 224483.98 81.6%
|
||||
16 r2 p 215691.19 78.4%
|
||||
16 r1 p 208332.83 75.7%
|
||||
16 r1 i 199206.50 72.4%
|
||||
16 r2 i 198963.70 72.3%
|
||||
-DDES_PTR
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
cc -O2
|
||||
DES_LONG is 'unsigned int'
|
||||
|
||||
options des ecb/s
|
||||
4 r2 p 181146.14 100.0%
|
||||
16 r2 p 172102.94 95.0%
|
||||
4 r2 i 165424.11 91.3%
|
||||
16 c p 160468.64 88.6%
|
||||
4 c p 156653.59 86.5%
|
||||
4 c i 155245.18 85.7%
|
||||
4 r1 p 154729.68 85.4%
|
||||
16 r2 i 154137.69 85.1%
|
||||
16 r1 p 152357.96 84.1%
|
||||
16 c i 148743.91 82.1%
|
||||
4 r1 i 146695.59 81.0%
|
||||
16 r1 i 144961.00 80.0%
|
||||
-DDES_RISC2 -DDES_PTR
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
HPUX 10 - 9000/887 - cc -D_HPUX_SOURCE -Aa +ESlit +O2 -Wl,-a,archive
|
||||
|
||||
options des ecb/s
|
||||
16 c i 149448.90 100.0%
|
||||
4 c i 145861.79 97.6%
|
||||
16 r2 i 141710.96 94.8%
|
||||
16 r1 i 139455.33 93.3%
|
||||
4 r2 i 138800.00 92.9%
|
||||
4 r1 i 136692.65 91.5%
|
||||
16 r2 p 110228.17 73.8%
|
||||
16 r1 p 109397.07 73.2%
|
||||
16 c p 109209.89 73.1%
|
||||
4 c p 108014.71 72.3%
|
||||
4 r2 p 107873.88 72.2%
|
||||
4 r1 p 107685.83 72.1%
|
||||
-DDES_UNROLL
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
solaris 2.5.1 - sparc 10 50mhz - gcc 2.7.2
|
||||
|
||||
options des ecb/s
|
||||
16 c i 124382.70 100.0%
|
||||
4 c i 118884.68 95.6%
|
||||
16 c p 112261.20 90.3%
|
||||
16 r2 i 111777.10 89.9%
|
||||
16 r2 p 108896.30 87.5%
|
||||
16 r1 p 108791.59 87.5%
|
||||
4 c p 107290.10 86.3%
|
||||
4 r1 p 104583.80 84.1%
|
||||
16 r1 i 104206.20 83.8%
|
||||
4 r2 p 103709.80 83.4%
|
||||
4 r2 i 98306.43 79.0%
|
||||
4 r1 i 91525.80 73.6%
|
||||
-DDES_UNROLL
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
solaris 2.5.1 usparc 167mhz?? - SC4.0 cc -fast -Xa -xO5
|
||||
|
||||
For the ultra sparc, SunC 4.0 cc -fast -Xa -xO5, running 'des_opts'
|
||||
gives a speed of 475,000 des/s while 'speed' gives 417,000 des/s.
|
||||
I believe the difference is tied up in optimisation that the compiler
|
||||
is able to perform when the code is 'inlined'. For 'speed', the DES
|
||||
routines are being linked from a library. I'll record the higher
|
||||
speed since if performance is everything, you can always inline
|
||||
'des_enc.c'.
|
||||
|
||||
[ 16-Jan-06 - I've been playing with the
|
||||
'-xtarget=ultra -xarch=v8plus -Xa -xO5 -Xa'
|
||||
and while it makes the des_opts numbers much slower, it makes the
|
||||
actual 'speed' numbers look better which is a realistic version of
|
||||
using the libraries. ]
|
||||
|
||||
options des ecb/s
|
||||
16 r1 p 475516.90 100.0%
|
||||
16 r2 p 439388.10 92.4%
|
||||
16 c i 427001.40 89.8%
|
||||
16 c p 419516.50 88.2%
|
||||
4 r2 p 409491.70 86.1%
|
||||
4 r1 p 404266.90 85.0%
|
||||
4 c p 398121.00 83.7%
|
||||
4 c i 370588.40 77.9%
|
||||
4 r1 i 362742.20 76.3%
|
||||
16 r2 i 331275.50 69.7%
|
||||
16 r1 i 324730.60 68.3%
|
||||
4 r2 i 63535.10 13.4% <-- very very weird, must be cache problems.
|
||||
-DDES_UNROLL -DDES_RISC1 -DDES_PTR
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
#
|
||||
# DES SECTION
|
||||
#
|
||||
deschar * T_DESCHARP
|
||||
des_cblock * T_CBLOCK
|
||||
des_cblock T_CBLOCK
|
||||
des_key_schedule T_SCHEDULE
|
||||
des_key_schedule * T_SCHEDULE
|
||||
|
||||
INPUT
|
||||
T_CBLOCK
|
||||
$var=(des_cblock *)SvPV($arg,len);
|
||||
if (len < DES_KEY_SZ)
|
||||
{
|
||||
croak(\"$var needs to be at least %u bytes long\",DES_KEY_SZ);
|
||||
}
|
||||
|
||||
T_SCHEDULE
|
||||
$var=(des_key_schedule *)SvPV($arg,len);
|
||||
if (len < DES_SCHEDULE_SZ)
|
||||
{
|
||||
croak(\"$var needs to be at least %u bytes long\",
|
||||
DES_SCHEDULE_SZ);
|
||||
}
|
||||
|
||||
OUTPUT
|
||||
T_CBLOCK
|
||||
sv_setpvn($arg,(char *)$var,DES_KEY_SZ);
|
||||
|
||||
T_SCHEDULE
|
||||
sv_setpvn($arg,(char *)$var,DES_SCHEDULE_SZ);
|
||||
|
||||
T_DESCHARP
|
||||
sv_setpvn($arg,(char *)$var,len);
|
||||
|
|
@ -263,7 +263,7 @@ e_cast.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
|||
e_cast.o: ../../include/openssl/symhacks.h ../cryptlib.h e_cast.c evp_locl.h
|
||||
e_des.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
||||
e_des.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
e_des.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
e_des.o: ../../include/openssl/des.h
|
||||
e_des.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
|
||||
e_des.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
|
||||
e_des.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
|
||||
|
|
@ -274,7 +274,7 @@ e_des.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
|||
e_des.o: ../../include/openssl/ui_compat.h ../cryptlib.h e_des.c evp_locl.h
|
||||
e_des3.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
||||
e_des3.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
e_des3.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
e_des3.o: ../../include/openssl/des.h
|
||||
e_des3.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
|
||||
e_des3.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
|
||||
e_des3.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
|
||||
|
|
@ -351,7 +351,7 @@ e_seed.o: e_seed.c evp_locl.h
|
|||
e_xcbc_d.o: ../../e_os.h ../../include/openssl/asn1.h
|
||||
e_xcbc_d.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
|
||||
e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
e_xcbc_d.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
e_xcbc_d.o: ../../include/openssl/e_os2.h
|
||||
e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h
|
||||
e_xcbc_d.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
|
||||
e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
|
||||
|
|
@ -519,7 +519,7 @@ m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
|
|||
m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c
|
||||
m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
|
||||
m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
m_mdc2.o: ../../include/openssl/des.h
|
||||
m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
|
||||
m_mdc2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
|
||||
m_mdc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ $ exheader_mdc2 := mdc2.h
|
|||
$ exheader_hmac := hmac.h
|
||||
$ exheader_ripemd := ripemd.h
|
||||
$ exheader_whrlpool := whrlpool.h
|
||||
$ exheader_des := des.h, des_old.h
|
||||
$ exheader_des := des.h
|
||||
$ exheader_aes := aes.h
|
||||
$ exheader_rc2 := rc2.h
|
||||
$ exheader_rc4 := rc4.h
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ clean:
|
|||
|
||||
mdc2_one.o: ../../e_os.h ../../include/openssl/bio.h
|
||||
mdc2_one.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
|
||||
mdc2_one.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
|
||||
mdc2_one.o: ../../include/openssl/des.h
|
||||
mdc2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
|
||||
mdc2_one.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h
|
||||
mdc2_one.o: ../../include/openssl/opensslconf.h
|
||||
|
|
@ -85,7 +85,7 @@ mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
|||
mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
|
||||
mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c
|
||||
mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
mdc2dgst.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
mdc2dgst.o: ../../include/openssl/e_os2.h
|
||||
mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
|
||||
mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
|
||||
mdc2dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ pem_info.o: ../cryptlib.h pem_info.c
|
|||
pem_lib.o: ../../e_os.h ../../include/openssl/asn1.h
|
||||
pem_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
|
||||
pem_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
|
||||
pem_lib.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
|
||||
pem_lib.o: ../../include/openssl/e_os2.h
|
||||
pem_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
|
||||
pem_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
|
||||
pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
|
||||
|
|
|
|||
|
|
@ -793,7 +793,7 @@ $ EXHEADER_MDC2 := mdc2.h
|
|||
$ EXHEADER_HMAC := hmac.h
|
||||
$ EXHEADER_RIPEMD := ripemd.h
|
||||
$ EXHEADER_WHRLPOOL := whrlpool.h
|
||||
$ EXHEADER_DES := des.h, des_old.h
|
||||
$ EXHEADER_DES := des.h
|
||||
$ EXHEADER_AES := aes.h
|
||||
$ EXHEADER_RC2 := rc2.h
|
||||
$ EXHEADER_RC4 := rc4.h
|
||||
|
|
|
|||
|
|
@ -570,7 +570,7 @@ casttest.o: ../include/openssl/opensslconf.h casttest.c
|
|||
constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h
|
||||
constant_time_test.o: ../include/openssl/e_os2.h
|
||||
constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c
|
||||
destest.o: ../include/openssl/des.h ../include/openssl/des_old.h
|
||||
destest.o: ../include/openssl/des.h
|
||||
destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
|
||||
destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
|
||||
destest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
|
||||
|
|
@ -736,7 +736,7 @@ md5test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
|
|||
md5test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md5test.c
|
||||
mdc2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
|
||||
mdc2test.o: ../include/openssl/crypto.h ../include/openssl/des.h
|
||||
mdc2test.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
|
||||
mdc2test.o: ../include/openssl/e_os2.h
|
||||
mdc2test.o: ../include/openssl/evp.h ../include/openssl/mdc2.h
|
||||
mdc2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
|
||||
mdc2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
|
|
|
|||
Loading…
Reference in a new issue