diff options
author | djm <> | 2010-10-01 22:54:19 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:54:19 +0000 |
commit | 242690ab2a8e991b85b4735c4e0bac0ec7bd3481 (patch) | |
tree | a55c90bd6ea9329d2afb5540220340cadd107178 /src/lib/libcrypto/rc5 | |
parent | 5d1f64994b96668ba794f5211364ed54dd7ee08d (diff) | |
download | openbsd-242690ab2a8e991b85b4735c4e0bac0ec7bd3481.tar.gz openbsd-242690ab2a8e991b85b4735c4e0bac0ec7bd3481.tar.bz2 openbsd-242690ab2a8e991b85b4735c4e0bac0ec7bd3481.zip |
import OpenSSL-1.0.0a
Diffstat (limited to 'src/lib/libcrypto/rc5')
-rw-r--r-- | src/lib/libcrypto/rc5/Makefile | 15 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5.h | 5 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/lib/libcrypto/rc5/Makefile b/src/lib/libcrypto/rc5/Makefile index b4e21c9bb2..8a8b00eb89 100644 --- a/src/lib/libcrypto/rc5/Makefile +++ b/src/lib/libcrypto/rc5/Makefile | |||
@@ -12,8 +12,6 @@ MAKEFILE= Makefile | |||
12 | AR= ar r | 12 | AR= ar r |
13 | 13 | ||
14 | RC5_ENC= rc5_enc.o | 14 | RC5_ENC= rc5_enc.o |
15 | # or use | ||
16 | #DES_ENC= r586-elf.o | ||
17 | 15 | ||
18 | CFLAGS= $(INCLUDES) $(CFLAG) | 16 | CFLAGS= $(INCLUDES) $(CFLAG) |
19 | ASFLAGS= $(INCLUDES) $(ASFLAG) | 17 | ASFLAGS= $(INCLUDES) $(ASFLAG) |
@@ -40,19 +38,12 @@ top: | |||
40 | all: lib | 38 | all: lib |
41 | 39 | ||
42 | lib: $(LIBOBJ) | 40 | lib: $(LIBOBJ) |
43 | $(ARX) $(LIB) $(LIBOBJ) | 41 | $(AR) $(LIB) $(LIBOBJ) |
44 | $(RANLIB) $(LIB) || echo Never mind. | 42 | $(RANLIB) $(LIB) || echo Never mind. |
45 | @touch lib | 43 | @touch lib |
46 | 44 | ||
47 | # ELF | 45 | rc5-586.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
48 | r586-elf.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | 46 | $(PERL) asm/rc5-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ |
49 | (cd asm; $(PERL) rc5-586.pl elf $(CFLAGS) > ../$@) | ||
50 | # COFF | ||
51 | r586-cof.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
52 | (cd asm; $(PERL) rc5-586.pl coff $(CFLAGS) > ../$@) | ||
53 | # a.out | ||
54 | r586-out.s: asm/rc5-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl | ||
55 | (cd asm; $(PERL) rc5-586.pl a.out $(CFLAGS) > ../$@) | ||
56 | 47 | ||
57 | files: | 48 | files: |
58 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO | 49 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
diff --git a/src/lib/libcrypto/rc5/rc5.h b/src/lib/libcrypto/rc5/rc5.h index f73a2a02a4..4b3c153b50 100644 --- a/src/lib/libcrypto/rc5/rc5.h +++ b/src/lib/libcrypto/rc5/rc5.h | |||
@@ -94,10 +94,7 @@ typedef struct rc5_key_st | |||
94 | RC5_32_INT data[2*(RC5_16_ROUNDS+1)]; | 94 | RC5_32_INT data[2*(RC5_16_ROUNDS+1)]; |
95 | } RC5_32_KEY; | 95 | } RC5_32_KEY; |
96 | 96 | ||
97 | #ifdef OPENSSL_FIPS | 97 | |
98 | void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | ||
99 | int rounds); | ||
100 | #endif | ||
101 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | 98 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, |
102 | int rounds); | 99 | int rounds); |
103 | void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, | 100 | void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, |