diff options
author | djm <> | 2013-01-26 06:10:22 +0000 |
---|---|---|
committer | djm <> | 2013-01-26 06:10:22 +0000 |
commit | 692574e51be904b35cfcb2609fd641e93dc8cef7 (patch) | |
tree | 6305c1c4e36b099e146b0bf242578ba0877f0a81 /src/lib/libcrypto | |
parent | 3b84eeed9fbdc1aa9a6d368cd52ba021c5cb1860 (diff) | |
download | openbsd-692574e51be904b35cfcb2609fd641e93dc8cef7.tar.gz openbsd-692574e51be904b35cfcb2609fd641e93dc8cef7.tar.bz2 openbsd-692574e51be904b35cfcb2609fd641e93dc8cef7.zip |
remove ACSS, crank libcrypto major; ok markus@ deraadt@
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r-- | src/lib/libcrypto/acss/acss.h | 47 | ||||
-rw-r--r-- | src/lib/libcrypto/acss/acss_enc.c | 177 | ||||
-rw-r--r-- | src/lib/libcrypto/acss/acss_skey.c | 87 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/e_acss.c | 85 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp.h | 6 |
5 files changed, 0 insertions, 402 deletions
diff --git a/src/lib/libcrypto/acss/acss.h b/src/lib/libcrypto/acss/acss.h deleted file mode 100644 index c2d3550796..0000000000 --- a/src/lib/libcrypto/acss/acss.h +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | /* $OpenBSD: acss.h,v 1.4 2005/04/25 13:20:52 miod Exp $ */ | ||
2 | /* | ||
3 | * Copyright (c) 2004 The OpenBSD project | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | #ifndef _ACSS_H_ | ||
19 | #define _ACSS_H_ | ||
20 | |||
21 | #ifdef OPENSSL_NO_ACSS | ||
22 | #error acss is disabled. | ||
23 | #endif | ||
24 | |||
25 | /* 40bit key */ | ||
26 | #define ACSS_KEYSIZE 5 | ||
27 | |||
28 | /* modes of acss */ | ||
29 | #define ACSS_MODE0 0 | ||
30 | #define ACSS_MODE1 1 | ||
31 | #define ACSS_MODE2 2 | ||
32 | #define ACSS_MODE3 3 | ||
33 | |||
34 | typedef struct acss_key_st { | ||
35 | unsigned int lfsr17; /* current state of lfsrs */ | ||
36 | unsigned int lfsr25; | ||
37 | unsigned int lfsrsum; | ||
38 | unsigned char seed[ACSS_KEYSIZE]; | ||
39 | unsigned char data[ACSS_KEYSIZE]; | ||
40 | int encrypt; | ||
41 | int mode; | ||
42 | } ACSS_KEY; | ||
43 | |||
44 | void acss_setkey(ACSS_KEY *, const unsigned char *, int, int); | ||
45 | void acss(ACSS_KEY *, unsigned long, const unsigned char *, unsigned char *); | ||
46 | |||
47 | #endif /* ifndef _ACSS_H_ */ | ||
diff --git a/src/lib/libcrypto/acss/acss_enc.c b/src/lib/libcrypto/acss/acss_enc.c deleted file mode 100644 index 829830bc54..0000000000 --- a/src/lib/libcrypto/acss/acss_enc.c +++ /dev/null | |||
@@ -1,177 +0,0 @@ | |||
1 | /* $OpenBSD: acss_enc.c,v 1.4 2004/02/13 10:05:44 hshoexer Exp $ */ | ||
2 | /* | ||
3 | * Copyright (c) 2004 The OpenBSD project | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | #include <openssl/acss.h> | ||
19 | |||
20 | /* decryption sbox */ | ||
21 | static unsigned char sboxdec[] = { | ||
22 | 0x33, 0x73, 0x3b, 0x26, 0x63, 0x23, 0x6b, 0x76, | ||
23 | 0x3e, 0x7e, 0x36, 0x2b, 0x6e, 0x2e, 0x66, 0x7b, | ||
24 | 0xd3, 0x93, 0xdb, 0x06, 0x43, 0x03, 0x4b, 0x96, | ||
25 | 0xde, 0x9e, 0xd6, 0x0b, 0x4e, 0x0e, 0x46, 0x9b, | ||
26 | 0x57, 0x17, 0x5f, 0x82, 0xc7, 0x87, 0xcf, 0x12, | ||
27 | 0x5a, 0x1a, 0x52, 0x8f, 0xca, 0x8a, 0xc2, 0x1f, | ||
28 | 0xd9, 0x99, 0xd1, 0x00, 0x49, 0x09, 0x41, 0x90, | ||
29 | 0xd8, 0x98, 0xd0, 0x01, 0x48, 0x08, 0x40, 0x91, | ||
30 | 0x3d, 0x7d, 0x35, 0x24, 0x6d, 0x2d, 0x65, 0x74, | ||
31 | 0x3c, 0x7c, 0x34, 0x25, 0x6c, 0x2c, 0x64, 0x75, | ||
32 | 0xdd, 0x9d, 0xd5, 0x04, 0x4d, 0x0d, 0x45, 0x94, | ||
33 | 0xdc, 0x9c, 0xd4, 0x05, 0x4c, 0x0c, 0x44, 0x95, | ||
34 | 0x59, 0x19, 0x51, 0x80, 0xc9, 0x89, 0xc1, 0x10, | ||
35 | 0x58, 0x18, 0x50, 0x81, 0xc8, 0x88, 0xc0, 0x11, | ||
36 | 0xd7, 0x97, 0xdf, 0x02, 0x47, 0x07, 0x4f, 0x92, | ||
37 | 0xda, 0x9a, 0xd2, 0x0f, 0x4a, 0x0a, 0x42, 0x9f, | ||
38 | 0x53, 0x13, 0x5b, 0x86, 0xc3, 0x83, 0xcb, 0x16, | ||
39 | 0x5e, 0x1e, 0x56, 0x8b, 0xce, 0x8e, 0xc6, 0x1b, | ||
40 | 0xb3, 0xf3, 0xbb, 0xa6, 0xe3, 0xa3, 0xeb, 0xf6, | ||
41 | 0xbe, 0xfe, 0xb6, 0xab, 0xee, 0xae, 0xe6, 0xfb, | ||
42 | 0x37, 0x77, 0x3f, 0x22, 0x67, 0x27, 0x6f, 0x72, | ||
43 | 0x3a, 0x7a, 0x32, 0x2f, 0x6a, 0x2a, 0x62, 0x7f, | ||
44 | 0xb9, 0xf9, 0xb1, 0xa0, 0xe9, 0xa9, 0xe1, 0xf0, | ||
45 | 0xb8, 0xf8, 0xb0, 0xa1, 0xe8, 0xa8, 0xe0, 0xf1, | ||
46 | 0x5d, 0x1d, 0x55, 0x84, 0xcd, 0x8d, 0xc5, 0x14, | ||
47 | 0x5c, 0x1c, 0x54, 0x85, 0xcc, 0x8c, 0xc4, 0x15, | ||
48 | 0xbd, 0xfd, 0xb5, 0xa4, 0xed, 0xad, 0xe5, 0xf4, | ||
49 | 0xbc, 0xfc, 0xb4, 0xa5, 0xec, 0xac, 0xe4, 0xf5, | ||
50 | 0x39, 0x79, 0x31, 0x20, 0x69, 0x29, 0x61, 0x70, | ||
51 | 0x38, 0x78, 0x30, 0x21, 0x68, 0x28, 0x60, 0x71, | ||
52 | 0xb7, 0xf7, 0xbf, 0xa2, 0xe7, 0xa7, 0xef, 0xf2, | ||
53 | 0xba, 0xfa, 0xb2, 0xaf, 0xea, 0xaa, 0xe2, 0xff | ||
54 | }; | ||
55 | |||
56 | /* encryption sbox */ | ||
57 | static unsigned char sboxenc[] = { | ||
58 | 0x33, 0x3b, 0x73, 0x15, 0x53, 0x5b, 0x13, 0x75, | ||
59 | 0x3d, 0x35, 0x7d, 0x1b, 0x5d, 0x55, 0x1d, 0x7b, | ||
60 | 0x67, 0x6f, 0x27, 0x81, 0xc7, 0xcf, 0x87, 0x21, | ||
61 | 0x69, 0x61, 0x29, 0x8f, 0xc9, 0xc1, 0x89, 0x2f, | ||
62 | 0xe3, 0xeb, 0xa3, 0x05, 0x43, 0x4b, 0x03, 0xa5, | ||
63 | 0xed, 0xe5, 0xad, 0x0b, 0x4d, 0x45, 0x0d, 0xab, | ||
64 | 0xea, 0xe2, 0xaa, 0x00, 0x4a, 0x42, 0x0a, 0xa0, | ||
65 | 0xe8, 0xe0, 0xa8, 0x02, 0x48, 0x40, 0x08, 0xa2, | ||
66 | 0x3e, 0x36, 0x7e, 0x14, 0x5e, 0x56, 0x1e, 0x74, | ||
67 | 0x3c, 0x34, 0x7c, 0x16, 0x5c, 0x54, 0x1c, 0x76, | ||
68 | 0x6a, 0x62, 0x2a, 0x80, 0xca, 0xc2, 0x8a, 0x20, | ||
69 | 0x68, 0x60, 0x28, 0x82, 0xc8, 0xc0, 0x88, 0x22, | ||
70 | 0xee, 0xe6, 0xae, 0x04, 0x4e, 0x46, 0x0e, 0xa4, | ||
71 | 0xec, 0xe4, 0xac, 0x06, 0x4c, 0x44, 0x0c, 0xa6, | ||
72 | 0xe7, 0xef, 0xa7, 0x01, 0x47, 0x4f, 0x07, 0xa1, | ||
73 | 0xe9, 0xe1, 0xa9, 0x0f, 0x49, 0x41, 0x09, 0xaf, | ||
74 | 0x63, 0x6b, 0x23, 0x85, 0xc3, 0xcb, 0x83, 0x25, | ||
75 | 0x6d, 0x65, 0x2d, 0x8b, 0xcd, 0xc5, 0x8d, 0x2b, | ||
76 | 0x37, 0x3f, 0x77, 0x11, 0x57, 0x5f, 0x17, 0x71, | ||
77 | 0x39, 0x31, 0x79, 0x1f, 0x59, 0x51, 0x19, 0x7f, | ||
78 | 0xb3, 0xbb, 0xf3, 0x95, 0xd3, 0xdb, 0x93, 0xf5, | ||
79 | 0xbd, 0xb5, 0xfd, 0x9b, 0xdd, 0xd5, 0x9d, 0xfb, | ||
80 | 0xba, 0xb2, 0xfa, 0x90, 0xda, 0xd2, 0x9a, 0xf0, | ||
81 | 0xb8, 0xb0, 0xf8, 0x92, 0xd8, 0xd0, 0x98, 0xf2, | ||
82 | 0x6e, 0x66, 0x2e, 0x84, 0xce, 0xc6, 0x8e, 0x24, | ||
83 | 0x6c, 0x64, 0x2c, 0x86, 0xcc, 0xc4, 0x8c, 0x26, | ||
84 | 0x3a, 0x32, 0x7a, 0x10, 0x5a, 0x52, 0x1a, 0x70, | ||
85 | 0x38, 0x30, 0x78, 0x12, 0x58, 0x50, 0x18, 0x72, | ||
86 | 0xbe, 0xb6, 0xfe, 0x94, 0xde, 0xd6, 0x9e, 0xf4, | ||
87 | 0xbc, 0xb4, 0xfc, 0x96, 0xdc, 0xd4, 0x9c, 0xf6, | ||
88 | 0xb7, 0xbf, 0xf7, 0x91, 0xd7, 0xdf, 0x97, 0xf1, | ||
89 | 0xb9, 0xb1, 0xf9, 0x9f, 0xd9, 0xd1, 0x99, 0xff | ||
90 | }; | ||
91 | |||
92 | /* | ||
93 | * Two linear feedback shift registers are used: | ||
94 | * | ||
95 | * lfsr17: polynomial of degree 17, primitive modulo 2 (listed in Schneier) | ||
96 | * x^15 + x + 1 | ||
97 | * lfsr25: polynomial of degree 25, not know if primitive modulo 2 | ||
98 | * x^13 + x^5 + x^4 + x + 1 | ||
99 | * | ||
100 | * Output bits are discarded, instead the feedback bits are added to produce | ||
101 | * the cipher stream. Depending on the mode, feedback bytes may be inverted | ||
102 | * bit-wise before addition. | ||
103 | * | ||
104 | * The lfsrs are seeded with bytes from the raw key: | ||
105 | * | ||
106 | * lfsr17: byte 0[0:7] at bit 9 | ||
107 | * byte 1[0:7] at bit 0 | ||
108 | * | ||
109 | * lfsr25: byte 2[0:4] at bit 16 | ||
110 | * byte 2[5:7] at bit 22 | ||
111 | * byte 3[0:7] at bit 8 | ||
112 | * byte 4[0:7] at bit 0 | ||
113 | * | ||
114 | * To prevent 0 cycles, 1's are inject at bit 8 in lfrs17 and bit 21 in | ||
115 | * lfsr25. | ||
116 | * | ||
117 | */ | ||
118 | |||
119 | void | ||
120 | acss(ACSS_KEY *key, unsigned long len, const unsigned char *in, | ||
121 | unsigned char *out) | ||
122 | { | ||
123 | unsigned long i; | ||
124 | unsigned long lfsr17tmp, lfsr25tmp, lfsrsumtmp; | ||
125 | |||
126 | lfsrsumtmp = lfsr17tmp = lfsr25tmp = 0; | ||
127 | |||
128 | /* keystream is sum of lfsrs */ | ||
129 | for (i = 0; i < len; i++) { | ||
130 | lfsr17tmp = key->lfsr17 ^ (key->lfsr17 >> 14); | ||
131 | key->lfsr17 = (key->lfsr17 >> 8) | ||
132 | ^ (lfsr17tmp << 9) | ||
133 | ^ (lfsr17tmp << 12) | ||
134 | ^ (lfsr17tmp << 15); | ||
135 | key->lfsr17 &= 0x1ffff; /* 17 bit LFSR */ | ||
136 | |||
137 | lfsr25tmp = key->lfsr25 | ||
138 | ^ (key->lfsr25 >> 3) | ||
139 | ^ (key->lfsr25 >> 4) | ||
140 | ^ (key->lfsr25 >> 12); | ||
141 | key->lfsr25 = (key->lfsr25 >> 8) ^ (lfsr25tmp << 17); | ||
142 | key->lfsr25 &= 0x1ffffff; /* 25 bit LFSR */ | ||
143 | |||
144 | lfsrsumtmp = key->lfsrsum; | ||
145 | |||
146 | /* addition */ | ||
147 | switch (key->mode) { | ||
148 | case ACSS_MODE3: | ||
149 | key->lfsrsum = 0xff & ~(key->lfsr17 >> 9); | ||
150 | key->lfsrsum += 0xff & ~(key->lfsr25 >> 17); | ||
151 | break; | ||
152 | case ACSS_MODE2: | ||
153 | key->lfsrsum = key->lfsr17 >> 9; | ||
154 | key->lfsrsum += 0xff & ~(key->lfsr25 >> 17); | ||
155 | break; | ||
156 | case ACSS_MODE1: | ||
157 | key->lfsrsum = 0xff & ~(key->lfsr17 >> 9); | ||
158 | key->lfsrsum += key->lfsr25 >> 17; | ||
159 | break; | ||
160 | case ACSS_MODE0: | ||
161 | default: | ||
162 | key->lfsrsum = key->lfsr17 >> 9; | ||
163 | key->lfsrsum += key->lfsr25 >> 17; | ||
164 | break; | ||
165 | } | ||
166 | key->lfsrsum += (lfsrsumtmp >> 8); | ||
167 | |||
168 | if (in == (unsigned char *)0) | ||
169 | /* generate only a keystream */ | ||
170 | out[i] = key->lfsrsum & 0xff; | ||
171 | else if (key->encrypt) { | ||
172 | out[i] = sboxenc[(in[i] ^ key->lfsrsum) & 0xff]; | ||
173 | } else { | ||
174 | out[i] = (sboxdec[in[i]] ^ key->lfsrsum) & 0xff; | ||
175 | } | ||
176 | } | ||
177 | } | ||
diff --git a/src/lib/libcrypto/acss/acss_skey.c b/src/lib/libcrypto/acss/acss_skey.c deleted file mode 100644 index 1f1a51eaf9..0000000000 --- a/src/lib/libcrypto/acss/acss_skey.c +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | /* $OpenBSD: acss_skey.c,v 1.3 2009/08/07 00:05:04 martynas Exp $ */ | ||
2 | /* | ||
3 | * Copyright (c) 2004 The OpenBSD project | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | #include <openssl/acss.h> | ||
19 | #include <string.h> | ||
20 | |||
21 | static unsigned char reverse[] = { | ||
22 | 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, | ||
23 | 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, | ||
24 | 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, | ||
25 | 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, | ||
26 | 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, | ||
27 | 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, | ||
28 | 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, | ||
29 | 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, | ||
30 | 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, | ||
31 | 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, | ||
32 | 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, | ||
33 | 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, | ||
34 | 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, | ||
35 | 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, | ||
36 | 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, | ||
37 | 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, | ||
38 | 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, | ||
39 | 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, | ||
40 | 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, | ||
41 | 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, | ||
42 | 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, | ||
43 | 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, | ||
44 | 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, | ||
45 | 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, | ||
46 | 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, | ||
47 | 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, | ||
48 | 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, | ||
49 | 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, | ||
50 | 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, | ||
51 | 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, | ||
52 | 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, | ||
53 | 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff | ||
54 | }; | ||
55 | |||
56 | static void | ||
57 | acss_seed(ACSS_KEY *key) | ||
58 | { | ||
59 | int i; | ||
60 | |||
61 | for (i = 0; i < ACSS_KEYSIZE; i++) | ||
62 | key->seed[i] = reverse[key->data[i]]; | ||
63 | |||
64 | /* seed lfsrs */ | ||
65 | key->lfsr17 = key->seed[1] | ||
66 | | (key->seed[0] << 9) | ||
67 | | (1 << 8); /* inject 1 at bit 9 */ | ||
68 | key->lfsr25 = key->seed[4] | ||
69 | | (key->seed[3] << 8) | ||
70 | | ((key->seed[2] & 0x1f) << 16) | ||
71 | | ((key->seed[2] & 0xe0) << 17) | ||
72 | | (1 << 21); /* inject 1 at bit 22 */ | ||
73 | |||
74 | key->lfsrsum = 0; | ||
75 | } | ||
76 | |||
77 | void | ||
78 | acss_setkey(ACSS_KEY *key, const unsigned char *data, int enc, int mode) | ||
79 | { | ||
80 | memcpy(key->data, data, sizeof(key->data)); | ||
81 | |||
82 | if (enc != -1) | ||
83 | key->encrypt = enc; | ||
84 | key->mode = mode; | ||
85 | |||
86 | acss_seed(key); | ||
87 | } | ||
diff --git a/src/lib/libcrypto/evp/e_acss.c b/src/lib/libcrypto/evp/e_acss.c deleted file mode 100644 index 9084a63d51..0000000000 --- a/src/lib/libcrypto/evp/e_acss.c +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | /* $Id: e_acss.c,v 1.3 2010/10/01 23:33:22 djm Exp $ */ | ||
2 | /* | ||
3 | * Copyright (c) 2004 The OpenBSD project | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | #ifndef OPENSSL_NO_ACSS | ||
19 | |||
20 | #include "cryptlib.h" | ||
21 | #include <openssl/evp.h> | ||
22 | #include <openssl/objects.h> | ||
23 | #include "evp_locl.h" | ||
24 | #include <openssl/acss.h> | ||
25 | |||
26 | typedef struct { | ||
27 | ACSS_KEY ks; | ||
28 | } EVP_ACSS_KEY; | ||
29 | |||
30 | #define data(ctx) EVP_C_DATA(EVP_ACSS_KEY,ctx) | ||
31 | |||
32 | static int acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
33 | const unsigned char *iv, int enc); | ||
34 | static int acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
35 | const unsigned char *in, size_t inl); | ||
36 | static int acss_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); | ||
37 | static const EVP_CIPHER acss_cipher = { | ||
38 | NID_undef, | ||
39 | 1,5,0, | ||
40 | 0, | ||
41 | acss_init_key, | ||
42 | acss_ciph, | ||
43 | NULL, | ||
44 | sizeof(EVP_ACSS_KEY), | ||
45 | NULL, | ||
46 | NULL, | ||
47 | acss_ctrl, | ||
48 | NULL | ||
49 | }; | ||
50 | |||
51 | const | ||
52 | EVP_CIPHER *EVP_acss(void) | ||
53 | { | ||
54 | return(&acss_cipher); | ||
55 | } | ||
56 | |||
57 | static int | ||
58 | acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | ||
59 | const unsigned char *iv, int enc) | ||
60 | { | ||
61 | acss_setkey(&data(ctx)->ks,key,enc,ACSS_MODE1); | ||
62 | return 1; | ||
63 | } | ||
64 | |||
65 | static int | ||
66 | acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, | ||
67 | size_t inl) | ||
68 | { | ||
69 | acss(&data(ctx)->ks,inl,in,out); | ||
70 | return 1; | ||
71 | } | ||
72 | |||
73 | static int | ||
74 | acss_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) | ||
75 | { | ||
76 | switch(type) { | ||
77 | case EVP_CTRL_SET_ACSS_MODE: | ||
78 | data(ctx)->ks.mode = arg; | ||
79 | return 1; | ||
80 | |||
81 | default: | ||
82 | return -1; | ||
83 | } | ||
84 | } | ||
85 | #endif | ||
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index aa9616e11b..3b1fa87576 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
@@ -394,9 +394,6 @@ struct evp_cipher_st | |||
394 | /* Set the GCM invocation field, decrypt only */ | 394 | /* Set the GCM invocation field, decrypt only */ |
395 | #define EVP_CTRL_GCM_SET_IV_INV 0x18 | 395 | #define EVP_CTRL_GCM_SET_IV_INV 0x18 |
396 | 396 | ||
397 | /* OpenBSD extension */ | ||
398 | #define EVP_CTRL_SET_ACSS_MODE 0x80 | ||
399 | |||
400 | /* GCM TLS constants */ | 397 | /* GCM TLS constants */ |
401 | /* Length of fixed part of IV derived from PRF */ | 398 | /* Length of fixed part of IV derived from PRF */ |
402 | #define EVP_GCM_TLS_FIXED_IV_LEN 4 | 399 | #define EVP_GCM_TLS_FIXED_IV_LEN 4 |
@@ -820,9 +817,6 @@ const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void); | |||
820 | const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void); | 817 | const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void); |
821 | #endif | 818 | #endif |
822 | #endif | 819 | #endif |
823 | #ifndef OPENSSL_NO_ACSS | ||
824 | const EVP_CIPHER *EVP_acss(void); | ||
825 | #endif | ||
826 | #ifndef OPENSSL_NO_CAMELLIA | 820 | #ifndef OPENSSL_NO_CAMELLIA |
827 | const EVP_CIPHER *EVP_camellia_128_ecb(void); | 821 | const EVP_CIPHER *EVP_camellia_128_ecb(void); |
828 | const EVP_CIPHER *EVP_camellia_128_cbc(void); | 822 | const EVP_CIPHER *EVP_camellia_128_cbc(void); |