diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-30 12:36:28 +0000 |
| commit | ff48c0d9098080b51ea12710029135916d117806 (patch) | |
| tree | 96e6af9caf170ba21a1027b24e306a07e27d7b75 /openssl/crypto/rc5 | |
| parent | bb731f5ac92655c4860a41fa818a7a63005f8369 (diff) | |
| download | vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.gz vcxsrv-ff48c0d9098080b51ea12710029135916d117806.tar.bz2 vcxsrv-ff48c0d9098080b51ea12710029135916d117806.zip | |
svn merge -r514:HEAD ^/branches/released .
Diffstat (limited to 'openssl/crypto/rc5')
| -rw-r--r-- | openssl/crypto/rc5/Makefile | 15 | ||||
| -rw-r--r-- | openssl/crypto/rc5/asm/rc5-586.pl | 3 | ||||
| -rw-r--r-- | openssl/crypto/rc5/rc5.h | 5 | ||||
| -rw-r--r-- | openssl/crypto/rc5/rc5_skey.c | 17 |
4 files changed, 6 insertions, 34 deletions
diff --git a/openssl/crypto/rc5/Makefile b/openssl/crypto/rc5/Makefile index b4e21c9bb..8a8b00eb8 100644 --- a/openssl/crypto/rc5/Makefile +++ b/openssl/crypto/rc5/Makefile @@ -12,8 +12,6 @@ MAKEFILE= Makefile AR= ar r RC5_ENC= rc5_enc.o -# or use -#DES_ENC= r586-elf.o CFLAGS= $(INCLUDES) $(CFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) @@ -40,19 +38,12 @@ top: all: lib lib: $(LIBOBJ) - $(ARX) $(LIB) $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib -# ELF -r586-elf.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - (cd asm; $(PERL) rc5-586.pl elf $(CFLAGS) > ../$@) -# COFF -r586-cof.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - (cd asm; $(PERL) rc5-586.pl coff $(CFLAGS) > ../$@) -# a.out -r586-out.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - (cd asm; $(PERL) rc5-586.pl a.out $(CFLAGS) > ../$@) +rc5-586.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl + $(PERL) asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO diff --git a/openssl/crypto/rc5/asm/rc5-586.pl b/openssl/crypto/rc5/asm/rc5-586.pl index edff1d1e6..61ac6effc 100644 --- a/openssl/crypto/rc5/asm/rc5-586.pl +++ b/openssl/crypto/rc5/asm/rc5-586.pl @@ -1,6 +1,7 @@ #!/usr/local/bin/perl -push(@INC,"perlasm","../../perlasm"); +$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; +push(@INC,"${dir}","${dir}../../perlasm"); require "x86asm.pl"; require "cbc.pl"; diff --git a/openssl/crypto/rc5/rc5.h b/openssl/crypto/rc5/rc5.h index f73a2a02a..4b3c153b5 100644 --- a/openssl/crypto/rc5/rc5.h +++ b/openssl/crypto/rc5/rc5.h @@ -94,10 +94,7 @@ typedef struct rc5_key_st RC5_32_INT data[2*(RC5_16_ROUNDS+1)]; } RC5_32_KEY; -#ifdef OPENSSL_FIPS -void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, - int rounds); -#endif + void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, int rounds); void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, diff --git a/openssl/crypto/rc5/rc5_skey.c b/openssl/crypto/rc5/rc5_skey.c index 247fa6500..a2e00a41c 100644 --- a/openssl/crypto/rc5/rc5_skey.c +++ b/openssl/crypto/rc5/rc5_skey.c @@ -56,28 +56,11 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include <openssl/rc5.h> -#ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#endif - #include "rc5_locl.h" -#ifdef OPENSSL_FIPS -void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, - int rounds) - { - if (FIPS_mode()) - FIPS_BAD_ABORT(RC5) - private_RC5_32_set_key(key, len, data, rounds); - } -void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, - int rounds) -#else void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, int rounds) -#endif { RC5_32_INT L[64],l,ll,A,B,*S,k; int i,j,m,c,t,ii,jj; |