diff options
author | jsing <> | 2015-02-10 11:37:58 +0000 |
---|---|---|
committer | jsing <> | 2015-02-10 11:37:58 +0000 |
commit | 377dc8bee6f957bdd62fbe118154a641c70a0f05 (patch) | |
tree | 3e634f48ec87895d9de3ab6bfacaec9e57505fbf /src | |
parent | 2469f93300b26559ef047be50758bab7378dc2f1 (diff) | |
download | openbsd-377dc8bee6f957bdd62fbe118154a641c70a0f05.tar.gz openbsd-377dc8bee6f957bdd62fbe118154a641c70a0f05.tar.bz2 openbsd-377dc8bee6f957bdd62fbe118154a641c70a0f05.zip |
Remove RC5 code - this is not currently enabled and is not likely to ever
be enabled.
Removes one symbol from libcrypto, however there is no ABI change.
ok beck@ miod@ tedu@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/crypto/Makefile | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/e_rc5.c | 128 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5.h | 118 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5_ecb.c | 78 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5_enc.c | 215 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5_locl.h | 194 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5_skey.c | 113 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5cfb64.c | 122 | ||||
-rw-r--r-- | src/lib/libcrypto/rc5/rc5ofb64.c | 111 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/e_rc5.c | 128 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rc5/rc5.h | 118 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rc5/rc5_ecb.c | 78 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rc5/rc5_enc.c | 215 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rc5/rc5_locl.h | 194 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rc5/rc5_skey.c | 113 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rc5/rc5cfb64.c | 122 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/rc5/rc5ofb64.c | 111 |
17 files changed, 2 insertions, 2166 deletions
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index 7790668ace..478991c9b7 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.54 2015/02/10 11:16:33 jsing Exp $ | 1 | # $OpenBSD: Makefile,v 1.55 2015/02/10 11:37:58 jsing Exp $ |
2 | 2 | ||
3 | LIB= crypto | 3 | LIB= crypto |
4 | 4 | ||
@@ -144,7 +144,7 @@ SRCS+= err.c err_all.c err_prn.c | |||
144 | SRCS+= encode.c digest.c evp_enc.c evp_key.c | 144 | SRCS+= encode.c digest.c evp_enc.c evp_key.c |
145 | SRCS+= e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c | 145 | SRCS+= e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c |
146 | SRCS+= e_rc4.c e_aes.c names.c | 146 | SRCS+= e_rc4.c e_aes.c names.c |
147 | SRCS+= e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c | 147 | SRCS+= e_xcbc_d.c e_rc2.c e_cast.c |
148 | SRCS+= m_null.c m_md4.c m_md5.c m_sha.c m_sha1.c m_wp.c | 148 | SRCS+= m_null.c m_md4.c m_md5.c m_sha.c m_sha1.c m_wp.c |
149 | SRCS+= m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c | 149 | SRCS+= m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c |
150 | SRCS+= p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c | 150 | SRCS+= p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c |
@@ -215,9 +215,6 @@ SRCS+= randfile.c rand_lib.c rand_err.c | |||
215 | # rc2/ | 215 | # rc2/ |
216 | SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c | 216 | SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c |
217 | 217 | ||
218 | # rc5/ | ||
219 | #SRCS+= rc5_skey.c rc5_ecb.c rc5cfb64.c rc5ofb64.c | ||
220 | |||
221 | # ripemd/ | 218 | # ripemd/ |
222 | SRCS+= rmd_dgst.c rmd_one.c | 219 | SRCS+= rmd_dgst.c rmd_one.c |
223 | 220 | ||
@@ -308,7 +305,6 @@ SRCS+= v3_asid.c v3_addr.c | |||
308 | ${LCRYPTO_SRC}/rand \ | 305 | ${LCRYPTO_SRC}/rand \ |
309 | ${LCRYPTO_SRC}/rc2 \ | 306 | ${LCRYPTO_SRC}/rc2 \ |
310 | ${LCRYPTO_SRC}/rc4 \ | 307 | ${LCRYPTO_SRC}/rc4 \ |
311 | ${LCRYPTO_SRC}/rc5 \ | ||
312 | ${LCRYPTO_SRC}/ripemd \ | 308 | ${LCRYPTO_SRC}/ripemd \ |
313 | ${LCRYPTO_SRC}/rsa \ | 309 | ${LCRYPTO_SRC}/rsa \ |
314 | ${LCRYPTO_SRC}/sha \ | 310 | ${LCRYPTO_SRC}/sha \ |
@@ -372,7 +368,6 @@ HDRS=\ | |||
372 | crypto/rand/rand.h \ | 368 | crypto/rand/rand.h \ |
373 | crypto/rc2/rc2.h \ | 369 | crypto/rc2/rc2.h \ |
374 | crypto/rc4/rc4.h \ | 370 | crypto/rc4/rc4.h \ |
375 | crypto/rc5/rc5.h \ | ||
376 | crypto/ripemd/ripemd.h \ | 371 | crypto/ripemd/ripemd.h \ |
377 | crypto/rsa/rsa.h \ | 372 | crypto/rsa/rsa.h \ |
378 | crypto/sha/sha.h \ | 373 | crypto/sha/sha.h \ |
@@ -434,7 +429,6 @@ SRCS+= bn_asm.c | |||
434 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c | 429 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c |
435 | SRCS+= des_enc.c fcrypt_b.c | 430 | SRCS+= des_enc.c fcrypt_b.c |
436 | SRCS+= rc4_enc.c rc4_skey.c | 431 | SRCS+= rc4_enc.c rc4_skey.c |
437 | #SRCS+= rc5_enc.c | ||
438 | SRCS+= wp_block.c | 432 | SRCS+= wp_block.c |
439 | .endif | 433 | .endif |
440 | 434 | ||
diff --git a/src/lib/libcrypto/evp/e_rc5.c b/src/lib/libcrypto/evp/e_rc5.c deleted file mode 100644 index 3a1dab9999..0000000000 --- a/src/lib/libcrypto/evp/e_rc5.c +++ /dev/null | |||
@@ -1,128 +0,0 @@ | |||
1 | /* $OpenBSD: e_rc5.c,v 1.7 2014/07/11 08:44:48 jsing Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | |||
61 | #include <openssl/opensslconf.h> | ||
62 | |||
63 | #ifndef OPENSSL_NO_RC5 | ||
64 | |||
65 | #include <openssl/evp.h> | ||
66 | #include <openssl/objects.h> | ||
67 | #include <openssl/rc5.h> | ||
68 | |||
69 | #include "evp_locl.h" | ||
70 | |||
71 | static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
72 | const unsigned char *iv, int enc); | ||
73 | static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr); | ||
74 | |||
75 | typedef struct { | ||
76 | int rounds; /* number of rounds */ | ||
77 | RC5_32_KEY ks; /* key schedule */ | ||
78 | } EVP_RC5_KEY; | ||
79 | |||
80 | #define data(ctx) EVP_C_DATA(EVP_RC5_KEY,ctx) | ||
81 | |||
82 | IMPLEMENT_BLOCK_CIPHER(rc5_32_12_16, ks, RC5_32, EVP_RC5_KEY, NID_rc5, | ||
83 | 8, RC5_32_KEY_LENGTH, 8, 64, | ||
84 | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT, | ||
85 | r_32_12_16_init_key, NULL, | ||
86 | NULL, NULL, rc5_ctrl) | ||
87 | |||
88 | static int | ||
89 | rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) | ||
90 | { | ||
91 | switch (type) { | ||
92 | case EVP_CTRL_INIT: | ||
93 | data(c)->rounds = RC5_12_ROUNDS; | ||
94 | return 1; | ||
95 | |||
96 | case EVP_CTRL_GET_RC5_ROUNDS: | ||
97 | *(int *)ptr = data(c)->rounds; | ||
98 | return 1; | ||
99 | |||
100 | case EVP_CTRL_SET_RC5_ROUNDS: | ||
101 | switch (arg) { | ||
102 | case RC5_8_ROUNDS: | ||
103 | case RC5_12_ROUNDS: | ||
104 | case RC5_16_ROUNDS: | ||
105 | data(c)->rounds = arg; | ||
106 | return 1; | ||
107 | |||
108 | default: | ||
109 | EVPerr(EVP_F_RC5_CTRL, | ||
110 | EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS); | ||
111 | return 0; | ||
112 | } | ||
113 | |||
114 | default: | ||
115 | return -1; | ||
116 | } | ||
117 | } | ||
118 | |||
119 | static int | ||
120 | r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
121 | const unsigned char *iv, int enc) | ||
122 | { | ||
123 | RC5_32_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_key_length(ctx), key, | ||
124 | data(ctx)->rounds); | ||
125 | return 1; | ||
126 | } | ||
127 | |||
128 | #endif | ||
diff --git a/src/lib/libcrypto/rc5/rc5.h b/src/lib/libcrypto/rc5/rc5.h deleted file mode 100644 index 2f076aca21..0000000000 --- a/src/lib/libcrypto/rc5/rc5.h +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | /* $OpenBSD: rc5.h,v 1.9 2014/06/12 15:49:30 deraadt Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #ifndef HEADER_RC5_H | ||
60 | #define HEADER_RC5_H | ||
61 | |||
62 | #include <openssl/opensslconf.h> /* OPENSSL_NO_RC5 */ | ||
63 | |||
64 | #ifdef __cplusplus | ||
65 | extern "C" { | ||
66 | #endif | ||
67 | |||
68 | #ifdef OPENSSL_NO_RC5 | ||
69 | #error RC5 is disabled. | ||
70 | #endif | ||
71 | |||
72 | #define RC5_ENCRYPT 1 | ||
73 | #define RC5_DECRYPT 0 | ||
74 | |||
75 | /* 32 bit. For Alpha, things may get weird */ | ||
76 | #define RC5_32_INT unsigned long | ||
77 | |||
78 | #define RC5_32_BLOCK 8 | ||
79 | #define RC5_32_KEY_LENGTH 16 /* This is a default, max is 255 */ | ||
80 | |||
81 | /* This are the only values supported. Tweak the code if you want more | ||
82 | * The most supported modes will be | ||
83 | * RC5-32/12/16 | ||
84 | * RC5-32/16/8 | ||
85 | */ | ||
86 | #define RC5_8_ROUNDS 8 | ||
87 | #define RC5_12_ROUNDS 12 | ||
88 | #define RC5_16_ROUNDS 16 | ||
89 | |||
90 | typedef struct rc5_key_st | ||
91 | { | ||
92 | /* Number of rounds */ | ||
93 | int rounds; | ||
94 | RC5_32_INT data[2*(RC5_16_ROUNDS+1)]; | ||
95 | } RC5_32_KEY; | ||
96 | |||
97 | |||
98 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | ||
99 | int rounds); | ||
100 | void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, | ||
101 | int enc); | ||
102 | void RC5_32_encrypt(unsigned long *data,RC5_32_KEY *key); | ||
103 | void RC5_32_decrypt(unsigned long *data,RC5_32_KEY *key); | ||
104 | void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out, | ||
105 | long length, RC5_32_KEY *ks, unsigned char *iv, | ||
106 | int enc); | ||
107 | void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out, | ||
108 | long length, RC5_32_KEY *schedule, | ||
109 | unsigned char *ivec, int *num, int enc); | ||
110 | void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, | ||
111 | long length, RC5_32_KEY *schedule, | ||
112 | unsigned char *ivec, int *num); | ||
113 | |||
114 | #ifdef __cplusplus | ||
115 | } | ||
116 | #endif | ||
117 | |||
118 | #endif | ||
diff --git a/src/lib/libcrypto/rc5/rc5_ecb.c b/src/lib/libcrypto/rc5/rc5_ecb.c deleted file mode 100644 index 95d610e79e..0000000000 --- a/src/lib/libcrypto/rc5/rc5_ecb.c +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_ecb.c,v 1.3 2014/07/09 11:10:51 bcook Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | #include <openssl/opensslv.h> | ||
62 | |||
63 | void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out, | ||
64 | RC5_32_KEY *ks, int encrypt) | ||
65 | { | ||
66 | unsigned long l,d[2]; | ||
67 | |||
68 | c2l(in,l); d[0]=l; | ||
69 | c2l(in,l); d[1]=l; | ||
70 | if (encrypt) | ||
71 | RC5_32_encrypt(d,ks); | ||
72 | else | ||
73 | RC5_32_decrypt(d,ks); | ||
74 | l=d[0]; l2c(l,out); | ||
75 | l=d[1]; l2c(l,out); | ||
76 | l=d[0]=d[1]=0; | ||
77 | } | ||
78 | |||
diff --git a/src/lib/libcrypto/rc5/rc5_enc.c b/src/lib/libcrypto/rc5/rc5_enc.c deleted file mode 100644 index 3828fe29c5..0000000000 --- a/src/lib/libcrypto/rc5/rc5_enc.c +++ /dev/null | |||
@@ -1,215 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_enc.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include <openssl/rc5.h> | ||
61 | #include "rc5_locl.h" | ||
62 | |||
63 | void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out, | ||
64 | long length, RC5_32_KEY *ks, unsigned char *iv, | ||
65 | int encrypt) | ||
66 | { | ||
67 | unsigned long tin0,tin1; | ||
68 | unsigned long tout0,tout1,xor0,xor1; | ||
69 | long l=length; | ||
70 | unsigned long tin[2]; | ||
71 | |||
72 | if (encrypt) | ||
73 | { | ||
74 | c2l(iv,tout0); | ||
75 | c2l(iv,tout1); | ||
76 | iv-=8; | ||
77 | for (l-=8; l>=0; l-=8) | ||
78 | { | ||
79 | c2l(in,tin0); | ||
80 | c2l(in,tin1); | ||
81 | tin0^=tout0; | ||
82 | tin1^=tout1; | ||
83 | tin[0]=tin0; | ||
84 | tin[1]=tin1; | ||
85 | RC5_32_encrypt(tin,ks); | ||
86 | tout0=tin[0]; l2c(tout0,out); | ||
87 | tout1=tin[1]; l2c(tout1,out); | ||
88 | } | ||
89 | if (l != -8) | ||
90 | { | ||
91 | c2ln(in,tin0,tin1,l+8); | ||
92 | tin0^=tout0; | ||
93 | tin1^=tout1; | ||
94 | tin[0]=tin0; | ||
95 | tin[1]=tin1; | ||
96 | RC5_32_encrypt(tin,ks); | ||
97 | tout0=tin[0]; l2c(tout0,out); | ||
98 | tout1=tin[1]; l2c(tout1,out); | ||
99 | } | ||
100 | l2c(tout0,iv); | ||
101 | l2c(tout1,iv); | ||
102 | } | ||
103 | else | ||
104 | { | ||
105 | c2l(iv,xor0); | ||
106 | c2l(iv,xor1); | ||
107 | iv-=8; | ||
108 | for (l-=8; l>=0; l-=8) | ||
109 | { | ||
110 | c2l(in,tin0); tin[0]=tin0; | ||
111 | c2l(in,tin1); tin[1]=tin1; | ||
112 | RC5_32_decrypt(tin,ks); | ||
113 | tout0=tin[0]^xor0; | ||
114 | tout1=tin[1]^xor1; | ||
115 | l2c(tout0,out); | ||
116 | l2c(tout1,out); | ||
117 | xor0=tin0; | ||
118 | xor1=tin1; | ||
119 | } | ||
120 | if (l != -8) | ||
121 | { | ||
122 | c2l(in,tin0); tin[0]=tin0; | ||
123 | c2l(in,tin1); tin[1]=tin1; | ||
124 | RC5_32_decrypt(tin,ks); | ||
125 | tout0=tin[0]^xor0; | ||
126 | tout1=tin[1]^xor1; | ||
127 | l2cn(tout0,tout1,out,l+8); | ||
128 | xor0=tin0; | ||
129 | xor1=tin1; | ||
130 | } | ||
131 | l2c(xor0,iv); | ||
132 | l2c(xor1,iv); | ||
133 | } | ||
134 | tin0=tin1=tout0=tout1=xor0=xor1=0; | ||
135 | tin[0]=tin[1]=0; | ||
136 | } | ||
137 | |||
138 | void RC5_32_encrypt(unsigned long *d, RC5_32_KEY *key) | ||
139 | { | ||
140 | RC5_32_INT a,b,*s; | ||
141 | |||
142 | s=key->data; | ||
143 | |||
144 | a=d[0]+s[0]; | ||
145 | b=d[1]+s[1]; | ||
146 | E_RC5_32(a,b,s, 2); | ||
147 | E_RC5_32(a,b,s, 4); | ||
148 | E_RC5_32(a,b,s, 6); | ||
149 | E_RC5_32(a,b,s, 8); | ||
150 | E_RC5_32(a,b,s,10); | ||
151 | E_RC5_32(a,b,s,12); | ||
152 | E_RC5_32(a,b,s,14); | ||
153 | E_RC5_32(a,b,s,16); | ||
154 | if (key->rounds == 12) | ||
155 | { | ||
156 | E_RC5_32(a,b,s,18); | ||
157 | E_RC5_32(a,b,s,20); | ||
158 | E_RC5_32(a,b,s,22); | ||
159 | E_RC5_32(a,b,s,24); | ||
160 | } | ||
161 | else if (key->rounds == 16) | ||
162 | { | ||
163 | /* Do a full expansion to avoid a jump */ | ||
164 | E_RC5_32(a,b,s,18); | ||
165 | E_RC5_32(a,b,s,20); | ||
166 | E_RC5_32(a,b,s,22); | ||
167 | E_RC5_32(a,b,s,24); | ||
168 | E_RC5_32(a,b,s,26); | ||
169 | E_RC5_32(a,b,s,28); | ||
170 | E_RC5_32(a,b,s,30); | ||
171 | E_RC5_32(a,b,s,32); | ||
172 | } | ||
173 | d[0]=a; | ||
174 | d[1]=b; | ||
175 | } | ||
176 | |||
177 | void RC5_32_decrypt(unsigned long *d, RC5_32_KEY *key) | ||
178 | { | ||
179 | RC5_32_INT a,b,*s; | ||
180 | |||
181 | s=key->data; | ||
182 | |||
183 | a=d[0]; | ||
184 | b=d[1]; | ||
185 | if (key->rounds == 16) | ||
186 | { | ||
187 | D_RC5_32(a,b,s,32); | ||
188 | D_RC5_32(a,b,s,30); | ||
189 | D_RC5_32(a,b,s,28); | ||
190 | D_RC5_32(a,b,s,26); | ||
191 | /* Do a full expansion to avoid a jump */ | ||
192 | D_RC5_32(a,b,s,24); | ||
193 | D_RC5_32(a,b,s,22); | ||
194 | D_RC5_32(a,b,s,20); | ||
195 | D_RC5_32(a,b,s,18); | ||
196 | } | ||
197 | else if (key->rounds == 12) | ||
198 | { | ||
199 | D_RC5_32(a,b,s,24); | ||
200 | D_RC5_32(a,b,s,22); | ||
201 | D_RC5_32(a,b,s,20); | ||
202 | D_RC5_32(a,b,s,18); | ||
203 | } | ||
204 | D_RC5_32(a,b,s,16); | ||
205 | D_RC5_32(a,b,s,14); | ||
206 | D_RC5_32(a,b,s,12); | ||
207 | D_RC5_32(a,b,s,10); | ||
208 | D_RC5_32(a,b,s, 8); | ||
209 | D_RC5_32(a,b,s, 6); | ||
210 | D_RC5_32(a,b,s, 4); | ||
211 | D_RC5_32(a,b,s, 2); | ||
212 | d[0]=a-s[0]; | ||
213 | d[1]=b-s[1]; | ||
214 | } | ||
215 | |||
diff --git a/src/lib/libcrypto/rc5/rc5_locl.h b/src/lib/libcrypto/rc5/rc5_locl.h deleted file mode 100644 index d4e0d30eca..0000000000 --- a/src/lib/libcrypto/rc5/rc5_locl.h +++ /dev/null | |||
@@ -1,194 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_locl.h,v 1.6 2014/08/18 19:15:34 bcook Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdint.h> | ||
60 | #include <stdlib.h> | ||
61 | |||
62 | #include <openssl/opensslconf.h> | ||
63 | |||
64 | #undef c2l | ||
65 | #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ | ||
66 | l|=((unsigned long)(*((c)++)))<< 8L, \ | ||
67 | l|=((unsigned long)(*((c)++)))<<16L, \ | ||
68 | l|=((unsigned long)(*((c)++)))<<24L) | ||
69 | |||
70 | /* NOTE - c is not incremented as per c2l */ | ||
71 | #undef c2ln | ||
72 | #define c2ln(c,l1,l2,n) { \ | ||
73 | c+=n; \ | ||
74 | l1=l2=0; \ | ||
75 | switch (n) { \ | ||
76 | case 8: l2 =((unsigned long)(*(--(c))))<<24L; \ | ||
77 | case 7: l2|=((unsigned long)(*(--(c))))<<16L; \ | ||
78 | case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \ | ||
79 | case 5: l2|=((unsigned long)(*(--(c)))); \ | ||
80 | case 4: l1 =((unsigned long)(*(--(c))))<<24L; \ | ||
81 | case 3: l1|=((unsigned long)(*(--(c))))<<16L; \ | ||
82 | case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \ | ||
83 | case 1: l1|=((unsigned long)(*(--(c)))); \ | ||
84 | } \ | ||
85 | } | ||
86 | |||
87 | #undef l2c | ||
88 | #define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ | ||
89 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | ||
90 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | ||
91 | *((c)++)=(unsigned char)(((l)>>24L)&0xff)) | ||
92 | |||
93 | /* NOTE - c is not incremented as per l2c */ | ||
94 | #undef l2cn | ||
95 | #define l2cn(l1,l2,c,n) { \ | ||
96 | c+=n; \ | ||
97 | switch (n) { \ | ||
98 | case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ | ||
99 | case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ | ||
100 | case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ | ||
101 | case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \ | ||
102 | case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ | ||
103 | case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ | ||
104 | case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ | ||
105 | case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \ | ||
106 | } \ | ||
107 | } | ||
108 | |||
109 | /* NOTE - c is not incremented as per n2l */ | ||
110 | #define n2ln(c,l1,l2,n) { \ | ||
111 | c+=n; \ | ||
112 | l1=l2=0; \ | ||
113 | switch (n) { \ | ||
114 | case 8: l2 =((unsigned long)(*(--(c)))) ; \ | ||
115 | case 7: l2|=((unsigned long)(*(--(c))))<< 8; \ | ||
116 | case 6: l2|=((unsigned long)(*(--(c))))<<16; \ | ||
117 | case 5: l2|=((unsigned long)(*(--(c))))<<24; \ | ||
118 | case 4: l1 =((unsigned long)(*(--(c)))) ; \ | ||
119 | case 3: l1|=((unsigned long)(*(--(c))))<< 8; \ | ||
120 | case 2: l1|=((unsigned long)(*(--(c))))<<16; \ | ||
121 | case 1: l1|=((unsigned long)(*(--(c))))<<24; \ | ||
122 | } \ | ||
123 | } | ||
124 | |||
125 | /* NOTE - c is not incremented as per l2n */ | ||
126 | #define l2nn(l1,l2,c,n) { \ | ||
127 | c+=n; \ | ||
128 | switch (n) { \ | ||
129 | case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \ | ||
130 | case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \ | ||
131 | case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \ | ||
132 | case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \ | ||
133 | case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \ | ||
134 | case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \ | ||
135 | case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \ | ||
136 | case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \ | ||
137 | } \ | ||
138 | } | ||
139 | |||
140 | #undef n2l | ||
141 | #define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \ | ||
142 | l|=((unsigned long)(*((c)++)))<<16L, \ | ||
143 | l|=((unsigned long)(*((c)++)))<< 8L, \ | ||
144 | l|=((unsigned long)(*((c)++)))) | ||
145 | |||
146 | #undef l2n | ||
147 | #define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ | ||
148 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | ||
149 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | ||
150 | *((c)++)=(unsigned char)(((l) )&0xff)) | ||
151 | |||
152 | static inline uint32_t ROTATE_l32(uint32_t a, uint32_t n) | ||
153 | { | ||
154 | uint32_t amt = n & 0x1f; | ||
155 | return (a << amt) | (a >> (32 - amt)); | ||
156 | } | ||
157 | |||
158 | static inline uint32_t ROTATE_r32(uint32_t a, uint32_t n) | ||
159 | { | ||
160 | uint32_t amt = n & 0x1f; | ||
161 | return (a << (32 - amt)) | (a >> amt); | ||
162 | } | ||
163 | |||
164 | #define RC5_32_MASK 0xffffffffL | ||
165 | |||
166 | #define RC5_16_P 0xB7E1 | ||
167 | #define RC5_16_Q 0x9E37 | ||
168 | #define RC5_32_P 0xB7E15163L | ||
169 | #define RC5_32_Q 0x9E3779B9L | ||
170 | #define RC5_64_P 0xB7E151628AED2A6BLL | ||
171 | #define RC5_64_Q 0x9E3779B97F4A7C15LL | ||
172 | |||
173 | #define E_RC5_32(a,b,s,n) \ | ||
174 | a^=b; \ | ||
175 | a=ROTATE_l32(a,b); \ | ||
176 | a+=s[n]; \ | ||
177 | a&=RC5_32_MASK; \ | ||
178 | b^=a; \ | ||
179 | b=ROTATE_l32(b,a); \ | ||
180 | b+=s[n+1]; \ | ||
181 | b&=RC5_32_MASK; | ||
182 | |||
183 | #define D_RC5_32(a,b,s,n) \ | ||
184 | b-=s[n+1]; \ | ||
185 | b&=RC5_32_MASK; \ | ||
186 | b=ROTATE_r32(b,a); \ | ||
187 | b^=a; \ | ||
188 | a-=s[n]; \ | ||
189 | a&=RC5_32_MASK; \ | ||
190 | a=ROTATE_r32(a,b); \ | ||
191 | a^=b; | ||
192 | |||
193 | |||
194 | |||
diff --git a/src/lib/libcrypto/rc5/rc5_skey.c b/src/lib/libcrypto/rc5/rc5_skey.c deleted file mode 100644 index fadd36d2a3..0000000000 --- a/src/lib/libcrypto/rc5/rc5_skey.c +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_skey.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | |||
62 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | ||
63 | int rounds) | ||
64 | { | ||
65 | RC5_32_INT L[64],l,ll,A,B,*S,k; | ||
66 | int i,j,m,c,t,ii,jj; | ||
67 | |||
68 | if ( (rounds != RC5_16_ROUNDS) && | ||
69 | (rounds != RC5_12_ROUNDS) && | ||
70 | (rounds != RC5_8_ROUNDS)) | ||
71 | rounds=RC5_16_ROUNDS; | ||
72 | |||
73 | key->rounds=rounds; | ||
74 | S= &(key->data[0]); | ||
75 | j=0; | ||
76 | for (i=0; i<=(len-8); i+=8) | ||
77 | { | ||
78 | c2l(data,l); | ||
79 | L[j++]=l; | ||
80 | c2l(data,l); | ||
81 | L[j++]=l; | ||
82 | } | ||
83 | ii=len-i; | ||
84 | if (ii) | ||
85 | { | ||
86 | k=len&0x07; | ||
87 | c2ln(data,l,ll,k); | ||
88 | L[j+0]=l; | ||
89 | L[j+1]=ll; | ||
90 | } | ||
91 | |||
92 | c=(len+3)/4; | ||
93 | t=(rounds+1)*2; | ||
94 | S[0]=RC5_32_P; | ||
95 | for (i=1; i<t; i++) | ||
96 | S[i]=(S[i-1]+RC5_32_Q)&RC5_32_MASK; | ||
97 | |||
98 | j=(t>c)?t:c; | ||
99 | j*=3; | ||
100 | ii=jj=0; | ||
101 | A=B=0; | ||
102 | for (i=0; i<j; i++) | ||
103 | { | ||
104 | k=(S[ii]+A+B)&RC5_32_MASK; | ||
105 | A=S[ii]=ROTATE_l32(k,3); | ||
106 | m=(int)(A+B); | ||
107 | k=(L[jj]+A+B)&RC5_32_MASK; | ||
108 | B=L[jj]=ROTATE_l32(k,m); | ||
109 | if (++ii >= t) ii=0; | ||
110 | if (++jj >= c) jj=0; | ||
111 | } | ||
112 | } | ||
113 | |||
diff --git a/src/lib/libcrypto/rc5/rc5cfb64.c b/src/lib/libcrypto/rc5/rc5cfb64.c deleted file mode 100644 index 0f4d11248c..0000000000 --- a/src/lib/libcrypto/rc5/rc5cfb64.c +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | /* $OpenBSD: rc5cfb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | |||
62 | /* The input and output encrypted as though 64bit cfb mode is being | ||
63 | * used. The extra state information to record how much of the | ||
64 | * 64bit block we have used is contained in *num; | ||
65 | */ | ||
66 | |||
67 | void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out, | ||
68 | long length, RC5_32_KEY *schedule, | ||
69 | unsigned char *ivec, int *num, int encrypt) | ||
70 | { | ||
71 | unsigned long v0,v1,t; | ||
72 | int n= *num; | ||
73 | long l=length; | ||
74 | unsigned long ti[2]; | ||
75 | unsigned char *iv,c,cc; | ||
76 | |||
77 | iv=(unsigned char *)ivec; | ||
78 | if (encrypt) | ||
79 | { | ||
80 | while (l--) | ||
81 | { | ||
82 | if (n == 0) | ||
83 | { | ||
84 | c2l(iv,v0); ti[0]=v0; | ||
85 | c2l(iv,v1); ti[1]=v1; | ||
86 | RC5_32_encrypt((unsigned long *)ti,schedule); | ||
87 | iv=(unsigned char *)ivec; | ||
88 | t=ti[0]; l2c(t,iv); | ||
89 | t=ti[1]; l2c(t,iv); | ||
90 | iv=(unsigned char *)ivec; | ||
91 | } | ||
92 | c= *(in++)^iv[n]; | ||
93 | *(out++)=c; | ||
94 | iv[n]=c; | ||
95 | n=(n+1)&0x07; | ||
96 | } | ||
97 | } | ||
98 | else | ||
99 | { | ||
100 | while (l--) | ||
101 | { | ||
102 | if (n == 0) | ||
103 | { | ||
104 | c2l(iv,v0); ti[0]=v0; | ||
105 | c2l(iv,v1); ti[1]=v1; | ||
106 | RC5_32_encrypt((unsigned long *)ti,schedule); | ||
107 | iv=(unsigned char *)ivec; | ||
108 | t=ti[0]; l2c(t,iv); | ||
109 | t=ti[1]; l2c(t,iv); | ||
110 | iv=(unsigned char *)ivec; | ||
111 | } | ||
112 | cc= *(in++); | ||
113 | c=iv[n]; | ||
114 | iv[n]=cc; | ||
115 | *(out++)=c^cc; | ||
116 | n=(n+1)&0x07; | ||
117 | } | ||
118 | } | ||
119 | v0=v1=ti[0]=ti[1]=t=c=cc=0; | ||
120 | *num=n; | ||
121 | } | ||
122 | |||
diff --git a/src/lib/libcrypto/rc5/rc5ofb64.c b/src/lib/libcrypto/rc5/rc5ofb64.c deleted file mode 100644 index 0a8686092b..0000000000 --- a/src/lib/libcrypto/rc5/rc5ofb64.c +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | /* $OpenBSD: rc5ofb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | |||
62 | /* The input and output encrypted as though 64bit ofb mode is being | ||
63 | * used. The extra state information to record how much of the | ||
64 | * 64bit block we have used is contained in *num; | ||
65 | */ | ||
66 | void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, | ||
67 | long length, RC5_32_KEY *schedule, | ||
68 | unsigned char *ivec, int *num) | ||
69 | { | ||
70 | unsigned long v0,v1,t; | ||
71 | int n= *num; | ||
72 | long l=length; | ||
73 | unsigned char d[8]; | ||
74 | char *dp; | ||
75 | unsigned long ti[2]; | ||
76 | unsigned char *iv; | ||
77 | int save=0; | ||
78 | |||
79 | iv=(unsigned char *)ivec; | ||
80 | c2l(iv,v0); | ||
81 | c2l(iv,v1); | ||
82 | ti[0]=v0; | ||
83 | ti[1]=v1; | ||
84 | dp=(char *)d; | ||
85 | l2c(v0,dp); | ||
86 | l2c(v1,dp); | ||
87 | while (l--) | ||
88 | { | ||
89 | if (n == 0) | ||
90 | { | ||
91 | RC5_32_encrypt((unsigned long *)ti,schedule); | ||
92 | dp=(char *)d; | ||
93 | t=ti[0]; l2c(t,dp); | ||
94 | t=ti[1]; l2c(t,dp); | ||
95 | save++; | ||
96 | } | ||
97 | *(out++)= *(in++)^d[n]; | ||
98 | n=(n+1)&0x07; | ||
99 | } | ||
100 | if (save) | ||
101 | { | ||
102 | v0=ti[0]; | ||
103 | v1=ti[1]; | ||
104 | iv=(unsigned char *)ivec; | ||
105 | l2c(v0,iv); | ||
106 | l2c(v1,iv); | ||
107 | } | ||
108 | t=v0=v1=ti[0]=ti[1]=0; | ||
109 | *num=n; | ||
110 | } | ||
111 | |||
diff --git a/src/lib/libssl/src/crypto/evp/e_rc5.c b/src/lib/libssl/src/crypto/evp/e_rc5.c deleted file mode 100644 index 3a1dab9999..0000000000 --- a/src/lib/libssl/src/crypto/evp/e_rc5.c +++ /dev/null | |||
@@ -1,128 +0,0 @@ | |||
1 | /* $OpenBSD: e_rc5.c,v 1.7 2014/07/11 08:44:48 jsing Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | |||
61 | #include <openssl/opensslconf.h> | ||
62 | |||
63 | #ifndef OPENSSL_NO_RC5 | ||
64 | |||
65 | #include <openssl/evp.h> | ||
66 | #include <openssl/objects.h> | ||
67 | #include <openssl/rc5.h> | ||
68 | |||
69 | #include "evp_locl.h" | ||
70 | |||
71 | static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
72 | const unsigned char *iv, int enc); | ||
73 | static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr); | ||
74 | |||
75 | typedef struct { | ||
76 | int rounds; /* number of rounds */ | ||
77 | RC5_32_KEY ks; /* key schedule */ | ||
78 | } EVP_RC5_KEY; | ||
79 | |||
80 | #define data(ctx) EVP_C_DATA(EVP_RC5_KEY,ctx) | ||
81 | |||
82 | IMPLEMENT_BLOCK_CIPHER(rc5_32_12_16, ks, RC5_32, EVP_RC5_KEY, NID_rc5, | ||
83 | 8, RC5_32_KEY_LENGTH, 8, 64, | ||
84 | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT, | ||
85 | r_32_12_16_init_key, NULL, | ||
86 | NULL, NULL, rc5_ctrl) | ||
87 | |||
88 | static int | ||
89 | rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) | ||
90 | { | ||
91 | switch (type) { | ||
92 | case EVP_CTRL_INIT: | ||
93 | data(c)->rounds = RC5_12_ROUNDS; | ||
94 | return 1; | ||
95 | |||
96 | case EVP_CTRL_GET_RC5_ROUNDS: | ||
97 | *(int *)ptr = data(c)->rounds; | ||
98 | return 1; | ||
99 | |||
100 | case EVP_CTRL_SET_RC5_ROUNDS: | ||
101 | switch (arg) { | ||
102 | case RC5_8_ROUNDS: | ||
103 | case RC5_12_ROUNDS: | ||
104 | case RC5_16_ROUNDS: | ||
105 | data(c)->rounds = arg; | ||
106 | return 1; | ||
107 | |||
108 | default: | ||
109 | EVPerr(EVP_F_RC5_CTRL, | ||
110 | EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS); | ||
111 | return 0; | ||
112 | } | ||
113 | |||
114 | default: | ||
115 | return -1; | ||
116 | } | ||
117 | } | ||
118 | |||
119 | static int | ||
120 | r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
121 | const unsigned char *iv, int enc) | ||
122 | { | ||
123 | RC5_32_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_key_length(ctx), key, | ||
124 | data(ctx)->rounds); | ||
125 | return 1; | ||
126 | } | ||
127 | |||
128 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/rc5/rc5.h b/src/lib/libssl/src/crypto/rc5/rc5.h deleted file mode 100644 index 2f076aca21..0000000000 --- a/src/lib/libssl/src/crypto/rc5/rc5.h +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | /* $OpenBSD: rc5.h,v 1.9 2014/06/12 15:49:30 deraadt Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #ifndef HEADER_RC5_H | ||
60 | #define HEADER_RC5_H | ||
61 | |||
62 | #include <openssl/opensslconf.h> /* OPENSSL_NO_RC5 */ | ||
63 | |||
64 | #ifdef __cplusplus | ||
65 | extern "C" { | ||
66 | #endif | ||
67 | |||
68 | #ifdef OPENSSL_NO_RC5 | ||
69 | #error RC5 is disabled. | ||
70 | #endif | ||
71 | |||
72 | #define RC5_ENCRYPT 1 | ||
73 | #define RC5_DECRYPT 0 | ||
74 | |||
75 | /* 32 bit. For Alpha, things may get weird */ | ||
76 | #define RC5_32_INT unsigned long | ||
77 | |||
78 | #define RC5_32_BLOCK 8 | ||
79 | #define RC5_32_KEY_LENGTH 16 /* This is a default, max is 255 */ | ||
80 | |||
81 | /* This are the only values supported. Tweak the code if you want more | ||
82 | * The most supported modes will be | ||
83 | * RC5-32/12/16 | ||
84 | * RC5-32/16/8 | ||
85 | */ | ||
86 | #define RC5_8_ROUNDS 8 | ||
87 | #define RC5_12_ROUNDS 12 | ||
88 | #define RC5_16_ROUNDS 16 | ||
89 | |||
90 | typedef struct rc5_key_st | ||
91 | { | ||
92 | /* Number of rounds */ | ||
93 | int rounds; | ||
94 | RC5_32_INT data[2*(RC5_16_ROUNDS+1)]; | ||
95 | } RC5_32_KEY; | ||
96 | |||
97 | |||
98 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | ||
99 | int rounds); | ||
100 | void RC5_32_ecb_encrypt(const unsigned char *in,unsigned char *out,RC5_32_KEY *key, | ||
101 | int enc); | ||
102 | void RC5_32_encrypt(unsigned long *data,RC5_32_KEY *key); | ||
103 | void RC5_32_decrypt(unsigned long *data,RC5_32_KEY *key); | ||
104 | void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out, | ||
105 | long length, RC5_32_KEY *ks, unsigned char *iv, | ||
106 | int enc); | ||
107 | void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out, | ||
108 | long length, RC5_32_KEY *schedule, | ||
109 | unsigned char *ivec, int *num, int enc); | ||
110 | void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, | ||
111 | long length, RC5_32_KEY *schedule, | ||
112 | unsigned char *ivec, int *num); | ||
113 | |||
114 | #ifdef __cplusplus | ||
115 | } | ||
116 | #endif | ||
117 | |||
118 | #endif | ||
diff --git a/src/lib/libssl/src/crypto/rc5/rc5_ecb.c b/src/lib/libssl/src/crypto/rc5/rc5_ecb.c deleted file mode 100644 index 95d610e79e..0000000000 --- a/src/lib/libssl/src/crypto/rc5/rc5_ecb.c +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_ecb.c,v 1.3 2014/07/09 11:10:51 bcook Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | #include <openssl/opensslv.h> | ||
62 | |||
63 | void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out, | ||
64 | RC5_32_KEY *ks, int encrypt) | ||
65 | { | ||
66 | unsigned long l,d[2]; | ||
67 | |||
68 | c2l(in,l); d[0]=l; | ||
69 | c2l(in,l); d[1]=l; | ||
70 | if (encrypt) | ||
71 | RC5_32_encrypt(d,ks); | ||
72 | else | ||
73 | RC5_32_decrypt(d,ks); | ||
74 | l=d[0]; l2c(l,out); | ||
75 | l=d[1]; l2c(l,out); | ||
76 | l=d[0]=d[1]=0; | ||
77 | } | ||
78 | |||
diff --git a/src/lib/libssl/src/crypto/rc5/rc5_enc.c b/src/lib/libssl/src/crypto/rc5/rc5_enc.c deleted file mode 100644 index 3828fe29c5..0000000000 --- a/src/lib/libssl/src/crypto/rc5/rc5_enc.c +++ /dev/null | |||
@@ -1,215 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_enc.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdio.h> | ||
60 | #include <openssl/rc5.h> | ||
61 | #include "rc5_locl.h" | ||
62 | |||
63 | void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out, | ||
64 | long length, RC5_32_KEY *ks, unsigned char *iv, | ||
65 | int encrypt) | ||
66 | { | ||
67 | unsigned long tin0,tin1; | ||
68 | unsigned long tout0,tout1,xor0,xor1; | ||
69 | long l=length; | ||
70 | unsigned long tin[2]; | ||
71 | |||
72 | if (encrypt) | ||
73 | { | ||
74 | c2l(iv,tout0); | ||
75 | c2l(iv,tout1); | ||
76 | iv-=8; | ||
77 | for (l-=8; l>=0; l-=8) | ||
78 | { | ||
79 | c2l(in,tin0); | ||
80 | c2l(in,tin1); | ||
81 | tin0^=tout0; | ||
82 | tin1^=tout1; | ||
83 | tin[0]=tin0; | ||
84 | tin[1]=tin1; | ||
85 | RC5_32_encrypt(tin,ks); | ||
86 | tout0=tin[0]; l2c(tout0,out); | ||
87 | tout1=tin[1]; l2c(tout1,out); | ||
88 | } | ||
89 | if (l != -8) | ||
90 | { | ||
91 | c2ln(in,tin0,tin1,l+8); | ||
92 | tin0^=tout0; | ||
93 | tin1^=tout1; | ||
94 | tin[0]=tin0; | ||
95 | tin[1]=tin1; | ||
96 | RC5_32_encrypt(tin,ks); | ||
97 | tout0=tin[0]; l2c(tout0,out); | ||
98 | tout1=tin[1]; l2c(tout1,out); | ||
99 | } | ||
100 | l2c(tout0,iv); | ||
101 | l2c(tout1,iv); | ||
102 | } | ||
103 | else | ||
104 | { | ||
105 | c2l(iv,xor0); | ||
106 | c2l(iv,xor1); | ||
107 | iv-=8; | ||
108 | for (l-=8; l>=0; l-=8) | ||
109 | { | ||
110 | c2l(in,tin0); tin[0]=tin0; | ||
111 | c2l(in,tin1); tin[1]=tin1; | ||
112 | RC5_32_decrypt(tin,ks); | ||
113 | tout0=tin[0]^xor0; | ||
114 | tout1=tin[1]^xor1; | ||
115 | l2c(tout0,out); | ||
116 | l2c(tout1,out); | ||
117 | xor0=tin0; | ||
118 | xor1=tin1; | ||
119 | } | ||
120 | if (l != -8) | ||
121 | { | ||
122 | c2l(in,tin0); tin[0]=tin0; | ||
123 | c2l(in,tin1); tin[1]=tin1; | ||
124 | RC5_32_decrypt(tin,ks); | ||
125 | tout0=tin[0]^xor0; | ||
126 | tout1=tin[1]^xor1; | ||
127 | l2cn(tout0,tout1,out,l+8); | ||
128 | xor0=tin0; | ||
129 | xor1=tin1; | ||
130 | } | ||
131 | l2c(xor0,iv); | ||
132 | l2c(xor1,iv); | ||
133 | } | ||
134 | tin0=tin1=tout0=tout1=xor0=xor1=0; | ||
135 | tin[0]=tin[1]=0; | ||
136 | } | ||
137 | |||
138 | void RC5_32_encrypt(unsigned long *d, RC5_32_KEY *key) | ||
139 | { | ||
140 | RC5_32_INT a,b,*s; | ||
141 | |||
142 | s=key->data; | ||
143 | |||
144 | a=d[0]+s[0]; | ||
145 | b=d[1]+s[1]; | ||
146 | E_RC5_32(a,b,s, 2); | ||
147 | E_RC5_32(a,b,s, 4); | ||
148 | E_RC5_32(a,b,s, 6); | ||
149 | E_RC5_32(a,b,s, 8); | ||
150 | E_RC5_32(a,b,s,10); | ||
151 | E_RC5_32(a,b,s,12); | ||
152 | E_RC5_32(a,b,s,14); | ||
153 | E_RC5_32(a,b,s,16); | ||
154 | if (key->rounds == 12) | ||
155 | { | ||
156 | E_RC5_32(a,b,s,18); | ||
157 | E_RC5_32(a,b,s,20); | ||
158 | E_RC5_32(a,b,s,22); | ||
159 | E_RC5_32(a,b,s,24); | ||
160 | } | ||
161 | else if (key->rounds == 16) | ||
162 | { | ||
163 | /* Do a full expansion to avoid a jump */ | ||
164 | E_RC5_32(a,b,s,18); | ||
165 | E_RC5_32(a,b,s,20); | ||
166 | E_RC5_32(a,b,s,22); | ||
167 | E_RC5_32(a,b,s,24); | ||
168 | E_RC5_32(a,b,s,26); | ||
169 | E_RC5_32(a,b,s,28); | ||
170 | E_RC5_32(a,b,s,30); | ||
171 | E_RC5_32(a,b,s,32); | ||
172 | } | ||
173 | d[0]=a; | ||
174 | d[1]=b; | ||
175 | } | ||
176 | |||
177 | void RC5_32_decrypt(unsigned long *d, RC5_32_KEY *key) | ||
178 | { | ||
179 | RC5_32_INT a,b,*s; | ||
180 | |||
181 | s=key->data; | ||
182 | |||
183 | a=d[0]; | ||
184 | b=d[1]; | ||
185 | if (key->rounds == 16) | ||
186 | { | ||
187 | D_RC5_32(a,b,s,32); | ||
188 | D_RC5_32(a,b,s,30); | ||
189 | D_RC5_32(a,b,s,28); | ||
190 | D_RC5_32(a,b,s,26); | ||
191 | /* Do a full expansion to avoid a jump */ | ||
192 | D_RC5_32(a,b,s,24); | ||
193 | D_RC5_32(a,b,s,22); | ||
194 | D_RC5_32(a,b,s,20); | ||
195 | D_RC5_32(a,b,s,18); | ||
196 | } | ||
197 | else if (key->rounds == 12) | ||
198 | { | ||
199 | D_RC5_32(a,b,s,24); | ||
200 | D_RC5_32(a,b,s,22); | ||
201 | D_RC5_32(a,b,s,20); | ||
202 | D_RC5_32(a,b,s,18); | ||
203 | } | ||
204 | D_RC5_32(a,b,s,16); | ||
205 | D_RC5_32(a,b,s,14); | ||
206 | D_RC5_32(a,b,s,12); | ||
207 | D_RC5_32(a,b,s,10); | ||
208 | D_RC5_32(a,b,s, 8); | ||
209 | D_RC5_32(a,b,s, 6); | ||
210 | D_RC5_32(a,b,s, 4); | ||
211 | D_RC5_32(a,b,s, 2); | ||
212 | d[0]=a-s[0]; | ||
213 | d[1]=b-s[1]; | ||
214 | } | ||
215 | |||
diff --git a/src/lib/libssl/src/crypto/rc5/rc5_locl.h b/src/lib/libssl/src/crypto/rc5/rc5_locl.h deleted file mode 100644 index d4e0d30eca..0000000000 --- a/src/lib/libssl/src/crypto/rc5/rc5_locl.h +++ /dev/null | |||
@@ -1,194 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_locl.h,v 1.6 2014/08/18 19:15:34 bcook Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <stdint.h> | ||
60 | #include <stdlib.h> | ||
61 | |||
62 | #include <openssl/opensslconf.h> | ||
63 | |||
64 | #undef c2l | ||
65 | #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ | ||
66 | l|=((unsigned long)(*((c)++)))<< 8L, \ | ||
67 | l|=((unsigned long)(*((c)++)))<<16L, \ | ||
68 | l|=((unsigned long)(*((c)++)))<<24L) | ||
69 | |||
70 | /* NOTE - c is not incremented as per c2l */ | ||
71 | #undef c2ln | ||
72 | #define c2ln(c,l1,l2,n) { \ | ||
73 | c+=n; \ | ||
74 | l1=l2=0; \ | ||
75 | switch (n) { \ | ||
76 | case 8: l2 =((unsigned long)(*(--(c))))<<24L; \ | ||
77 | case 7: l2|=((unsigned long)(*(--(c))))<<16L; \ | ||
78 | case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \ | ||
79 | case 5: l2|=((unsigned long)(*(--(c)))); \ | ||
80 | case 4: l1 =((unsigned long)(*(--(c))))<<24L; \ | ||
81 | case 3: l1|=((unsigned long)(*(--(c))))<<16L; \ | ||
82 | case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \ | ||
83 | case 1: l1|=((unsigned long)(*(--(c)))); \ | ||
84 | } \ | ||
85 | } | ||
86 | |||
87 | #undef l2c | ||
88 | #define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ | ||
89 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | ||
90 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | ||
91 | *((c)++)=(unsigned char)(((l)>>24L)&0xff)) | ||
92 | |||
93 | /* NOTE - c is not incremented as per l2c */ | ||
94 | #undef l2cn | ||
95 | #define l2cn(l1,l2,c,n) { \ | ||
96 | c+=n; \ | ||
97 | switch (n) { \ | ||
98 | case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ | ||
99 | case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ | ||
100 | case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ | ||
101 | case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \ | ||
102 | case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ | ||
103 | case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ | ||
104 | case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ | ||
105 | case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \ | ||
106 | } \ | ||
107 | } | ||
108 | |||
109 | /* NOTE - c is not incremented as per n2l */ | ||
110 | #define n2ln(c,l1,l2,n) { \ | ||
111 | c+=n; \ | ||
112 | l1=l2=0; \ | ||
113 | switch (n) { \ | ||
114 | case 8: l2 =((unsigned long)(*(--(c)))) ; \ | ||
115 | case 7: l2|=((unsigned long)(*(--(c))))<< 8; \ | ||
116 | case 6: l2|=((unsigned long)(*(--(c))))<<16; \ | ||
117 | case 5: l2|=((unsigned long)(*(--(c))))<<24; \ | ||
118 | case 4: l1 =((unsigned long)(*(--(c)))) ; \ | ||
119 | case 3: l1|=((unsigned long)(*(--(c))))<< 8; \ | ||
120 | case 2: l1|=((unsigned long)(*(--(c))))<<16; \ | ||
121 | case 1: l1|=((unsigned long)(*(--(c))))<<24; \ | ||
122 | } \ | ||
123 | } | ||
124 | |||
125 | /* NOTE - c is not incremented as per l2n */ | ||
126 | #define l2nn(l1,l2,c,n) { \ | ||
127 | c+=n; \ | ||
128 | switch (n) { \ | ||
129 | case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \ | ||
130 | case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \ | ||
131 | case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \ | ||
132 | case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \ | ||
133 | case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \ | ||
134 | case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \ | ||
135 | case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \ | ||
136 | case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \ | ||
137 | } \ | ||
138 | } | ||
139 | |||
140 | #undef n2l | ||
141 | #define n2l(c,l) (l =((unsigned long)(*((c)++)))<<24L, \ | ||
142 | l|=((unsigned long)(*((c)++)))<<16L, \ | ||
143 | l|=((unsigned long)(*((c)++)))<< 8L, \ | ||
144 | l|=((unsigned long)(*((c)++)))) | ||
145 | |||
146 | #undef l2n | ||
147 | #define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ | ||
148 | *((c)++)=(unsigned char)(((l)>>16L)&0xff), \ | ||
149 | *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ | ||
150 | *((c)++)=(unsigned char)(((l) )&0xff)) | ||
151 | |||
152 | static inline uint32_t ROTATE_l32(uint32_t a, uint32_t n) | ||
153 | { | ||
154 | uint32_t amt = n & 0x1f; | ||
155 | return (a << amt) | (a >> (32 - amt)); | ||
156 | } | ||
157 | |||
158 | static inline uint32_t ROTATE_r32(uint32_t a, uint32_t n) | ||
159 | { | ||
160 | uint32_t amt = n & 0x1f; | ||
161 | return (a << (32 - amt)) | (a >> amt); | ||
162 | } | ||
163 | |||
164 | #define RC5_32_MASK 0xffffffffL | ||
165 | |||
166 | #define RC5_16_P 0xB7E1 | ||
167 | #define RC5_16_Q 0x9E37 | ||
168 | #define RC5_32_P 0xB7E15163L | ||
169 | #define RC5_32_Q 0x9E3779B9L | ||
170 | #define RC5_64_P 0xB7E151628AED2A6BLL | ||
171 | #define RC5_64_Q 0x9E3779B97F4A7C15LL | ||
172 | |||
173 | #define E_RC5_32(a,b,s,n) \ | ||
174 | a^=b; \ | ||
175 | a=ROTATE_l32(a,b); \ | ||
176 | a+=s[n]; \ | ||
177 | a&=RC5_32_MASK; \ | ||
178 | b^=a; \ | ||
179 | b=ROTATE_l32(b,a); \ | ||
180 | b+=s[n+1]; \ | ||
181 | b&=RC5_32_MASK; | ||
182 | |||
183 | #define D_RC5_32(a,b,s,n) \ | ||
184 | b-=s[n+1]; \ | ||
185 | b&=RC5_32_MASK; \ | ||
186 | b=ROTATE_r32(b,a); \ | ||
187 | b^=a; \ | ||
188 | a-=s[n]; \ | ||
189 | a&=RC5_32_MASK; \ | ||
190 | a=ROTATE_r32(a,b); \ | ||
191 | a^=b; | ||
192 | |||
193 | |||
194 | |||
diff --git a/src/lib/libssl/src/crypto/rc5/rc5_skey.c b/src/lib/libssl/src/crypto/rc5/rc5_skey.c deleted file mode 100644 index fadd36d2a3..0000000000 --- a/src/lib/libssl/src/crypto/rc5/rc5_skey.c +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | /* $OpenBSD: rc5_skey.c,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | |||
62 | void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, | ||
63 | int rounds) | ||
64 | { | ||
65 | RC5_32_INT L[64],l,ll,A,B,*S,k; | ||
66 | int i,j,m,c,t,ii,jj; | ||
67 | |||
68 | if ( (rounds != RC5_16_ROUNDS) && | ||
69 | (rounds != RC5_12_ROUNDS) && | ||
70 | (rounds != RC5_8_ROUNDS)) | ||
71 | rounds=RC5_16_ROUNDS; | ||
72 | |||
73 | key->rounds=rounds; | ||
74 | S= &(key->data[0]); | ||
75 | j=0; | ||
76 | for (i=0; i<=(len-8); i+=8) | ||
77 | { | ||
78 | c2l(data,l); | ||
79 | L[j++]=l; | ||
80 | c2l(data,l); | ||
81 | L[j++]=l; | ||
82 | } | ||
83 | ii=len-i; | ||
84 | if (ii) | ||
85 | { | ||
86 | k=len&0x07; | ||
87 | c2ln(data,l,ll,k); | ||
88 | L[j+0]=l; | ||
89 | L[j+1]=ll; | ||
90 | } | ||
91 | |||
92 | c=(len+3)/4; | ||
93 | t=(rounds+1)*2; | ||
94 | S[0]=RC5_32_P; | ||
95 | for (i=1; i<t; i++) | ||
96 | S[i]=(S[i-1]+RC5_32_Q)&RC5_32_MASK; | ||
97 | |||
98 | j=(t>c)?t:c; | ||
99 | j*=3; | ||
100 | ii=jj=0; | ||
101 | A=B=0; | ||
102 | for (i=0; i<j; i++) | ||
103 | { | ||
104 | k=(S[ii]+A+B)&RC5_32_MASK; | ||
105 | A=S[ii]=ROTATE_l32(k,3); | ||
106 | m=(int)(A+B); | ||
107 | k=(L[jj]+A+B)&RC5_32_MASK; | ||
108 | B=L[jj]=ROTATE_l32(k,m); | ||
109 | if (++ii >= t) ii=0; | ||
110 | if (++jj >= c) jj=0; | ||
111 | } | ||
112 | } | ||
113 | |||
diff --git a/src/lib/libssl/src/crypto/rc5/rc5cfb64.c b/src/lib/libssl/src/crypto/rc5/rc5cfb64.c deleted file mode 100644 index 0f4d11248c..0000000000 --- a/src/lib/libssl/src/crypto/rc5/rc5cfb64.c +++ /dev/null | |||
@@ -1,122 +0,0 @@ | |||
1 | /* $OpenBSD: rc5cfb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | |||
62 | /* The input and output encrypted as though 64bit cfb mode is being | ||
63 | * used. The extra state information to record how much of the | ||
64 | * 64bit block we have used is contained in *num; | ||
65 | */ | ||
66 | |||
67 | void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out, | ||
68 | long length, RC5_32_KEY *schedule, | ||
69 | unsigned char *ivec, int *num, int encrypt) | ||
70 | { | ||
71 | unsigned long v0,v1,t; | ||
72 | int n= *num; | ||
73 | long l=length; | ||
74 | unsigned long ti[2]; | ||
75 | unsigned char *iv,c,cc; | ||
76 | |||
77 | iv=(unsigned char *)ivec; | ||
78 | if (encrypt) | ||
79 | { | ||
80 | while (l--) | ||
81 | { | ||
82 | if (n == 0) | ||
83 | { | ||
84 | c2l(iv,v0); ti[0]=v0; | ||
85 | c2l(iv,v1); ti[1]=v1; | ||
86 | RC5_32_encrypt((unsigned long *)ti,schedule); | ||
87 | iv=(unsigned char *)ivec; | ||
88 | t=ti[0]; l2c(t,iv); | ||
89 | t=ti[1]; l2c(t,iv); | ||
90 | iv=(unsigned char *)ivec; | ||
91 | } | ||
92 | c= *(in++)^iv[n]; | ||
93 | *(out++)=c; | ||
94 | iv[n]=c; | ||
95 | n=(n+1)&0x07; | ||
96 | } | ||
97 | } | ||
98 | else | ||
99 | { | ||
100 | while (l--) | ||
101 | { | ||
102 | if (n == 0) | ||
103 | { | ||
104 | c2l(iv,v0); ti[0]=v0; | ||
105 | c2l(iv,v1); ti[1]=v1; | ||
106 | RC5_32_encrypt((unsigned long *)ti,schedule); | ||
107 | iv=(unsigned char *)ivec; | ||
108 | t=ti[0]; l2c(t,iv); | ||
109 | t=ti[1]; l2c(t,iv); | ||
110 | iv=(unsigned char *)ivec; | ||
111 | } | ||
112 | cc= *(in++); | ||
113 | c=iv[n]; | ||
114 | iv[n]=cc; | ||
115 | *(out++)=c^cc; | ||
116 | n=(n+1)&0x07; | ||
117 | } | ||
118 | } | ||
119 | v0=v1=ti[0]=ti[1]=t=c=cc=0; | ||
120 | *num=n; | ||
121 | } | ||
122 | |||
diff --git a/src/lib/libssl/src/crypto/rc5/rc5ofb64.c b/src/lib/libssl/src/crypto/rc5/rc5ofb64.c deleted file mode 100644 index 0a8686092b..0000000000 --- a/src/lib/libssl/src/crypto/rc5/rc5ofb64.c +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | /* $OpenBSD: rc5ofb64.c,v 1.3 2014/10/28 07:35:59 jsg Exp $ */ | ||
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * This package is an SSL implementation written | ||
6 | * by Eric Young (eay@cryptsoft.com). | ||
7 | * The implementation was written so as to conform with Netscapes SSL. | ||
8 | * | ||
9 | * This library is free for commercial and non-commercial use as long as | ||
10 | * the following conditions are aheared to. The following conditions | ||
11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
13 | * included with this distribution is covered by the same copyright terms | ||
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
15 | * | ||
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
17 | * the code are not to be removed. | ||
18 | * If this package is used in a product, Eric Young should be given attribution | ||
19 | * as the author of the parts of the library used. | ||
20 | * This can be in the form of a textual message at program startup or | ||
21 | * in documentation (online or textual) provided with the package. | ||
22 | * | ||
23 | * Redistribution and use in source and binary forms, with or without | ||
24 | * modification, are permitted provided that the following conditions | ||
25 | * are met: | ||
26 | * 1. Redistributions of source code must retain the copyright | ||
27 | * notice, this list of conditions and the following disclaimer. | ||
28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
29 | * notice, this list of conditions and the following disclaimer in the | ||
30 | * documentation and/or other materials provided with the distribution. | ||
31 | * 3. All advertising materials mentioning features or use of this software | ||
32 | * must display the following acknowledgement: | ||
33 | * "This product includes cryptographic software written by | ||
34 | * Eric Young (eay@cryptsoft.com)" | ||
35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
36 | * being used are not cryptographic related :-). | ||
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
38 | * the apps directory (application code) you must include an acknowledgement: | ||
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
40 | * | ||
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
51 | * SUCH DAMAGE. | ||
52 | * | ||
53 | * The licence and distribution terms for any publically available version or | ||
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
55 | * copied and put under another distribution licence | ||
56 | * [including the GNU Public Licence.] | ||
57 | */ | ||
58 | |||
59 | #include <openssl/rc5.h> | ||
60 | #include "rc5_locl.h" | ||
61 | |||
62 | /* The input and output encrypted as though 64bit ofb mode is being | ||
63 | * used. The extra state information to record how much of the | ||
64 | * 64bit block we have used is contained in *num; | ||
65 | */ | ||
66 | void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, | ||
67 | long length, RC5_32_KEY *schedule, | ||
68 | unsigned char *ivec, int *num) | ||
69 | { | ||
70 | unsigned long v0,v1,t; | ||
71 | int n= *num; | ||
72 | long l=length; | ||
73 | unsigned char d[8]; | ||
74 | char *dp; | ||
75 | unsigned long ti[2]; | ||
76 | unsigned char *iv; | ||
77 | int save=0; | ||
78 | |||
79 | iv=(unsigned char *)ivec; | ||
80 | c2l(iv,v0); | ||
81 | c2l(iv,v1); | ||
82 | ti[0]=v0; | ||
83 | ti[1]=v1; | ||
84 | dp=(char *)d; | ||
85 | l2c(v0,dp); | ||
86 | l2c(v1,dp); | ||
87 | while (l--) | ||
88 | { | ||
89 | if (n == 0) | ||
90 | { | ||
91 | RC5_32_encrypt((unsigned long *)ti,schedule); | ||
92 | dp=(char *)d; | ||
93 | t=ti[0]; l2c(t,dp); | ||
94 | t=ti[1]; l2c(t,dp); | ||
95 | save++; | ||
96 | } | ||
97 | *(out++)= *(in++)^d[n]; | ||
98 | n=(n+1)&0x07; | ||
99 | } | ||
100 | if (save) | ||
101 | { | ||
102 | v0=ti[0]; | ||
103 | v1=ti[1]; | ||
104 | iv=(unsigned char *)ivec; | ||
105 | l2c(v0,iv); | ||
106 | l2c(v1,iv); | ||
107 | } | ||
108 | t=v0=v1=ti[0]=ti[1]=0; | ||
109 | *num=n; | ||
110 | } | ||
111 | |||