diff options
author | djm <> | 2009-01-09 12:14:09 +0000 |
---|---|---|
committer | djm <> | 2009-01-09 12:14:09 +0000 |
commit | 76dd4d55fdccad54d20608e7caf577b9d67b216f (patch) | |
tree | 9b645adc5cf0aa0820e1501ee5c6f2c41c454e7c /src/lib/libcrypto/rc5 | |
parent | f1625f274acf5dcd5601f6cb5e29e233b2a441a3 (diff) | |
download | openbsd-76dd4d55fdccad54d20608e7caf577b9d67b216f.tar.gz openbsd-76dd4d55fdccad54d20608e7caf577b9d67b216f.tar.bz2 openbsd-76dd4d55fdccad54d20608e7caf577b9d67b216f.zip |
import openssl-0.9.8j
Diffstat (limited to 'src/lib/libcrypto/rc5')
-rw-r--r-- | src/lib/libcrypto/rc5/Makefile | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libcrypto/rc5/Makefile b/src/lib/libcrypto/rc5/Makefile index efb0f36b59..b4e21c9bb2 100644 --- a/src/lib/libcrypto/rc5/Makefile +++ b/src/lib/libcrypto/rc5/Makefile | |||
@@ -40,7 +40,7 @@ top: | |||
40 | all: lib | 40 | all: lib |
41 | 41 | ||
42 | lib: $(LIBOBJ) | 42 | lib: $(LIBOBJ) |
43 | $(AR) $(LIB) $(LIBOBJ) | 43 | $(ARX) $(LIB) $(LIBOBJ) |
44 | $(RANLIB) $(LIB) || echo Never mind. | 44 | $(RANLIB) $(LIB) || echo Never mind. |
45 | @touch lib | 45 | @touch lib |
46 | 46 | ||
diff --git a/src/lib/libcrypto/rc5/rc5.h b/src/lib/libcrypto/rc5/rc5.h index 4b3c153b50..f73a2a02a4 100644 --- a/src/lib/libcrypto/rc5/rc5.h +++ b/src/lib/libcrypto/rc5/rc5.h | |||
@@ -94,7 +94,10 @@ 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 | 97 | #ifdef OPENSSL_FIPS | |
98 | void private_RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | ||
99 | int rounds); | ||
100 | #endif | ||
98 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | 101 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, |
99 | int rounds); | 102 | int rounds); |
100 | void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, | 103 | void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, |