summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortedu <>2014-05-17 15:45:50 +0000
committertedu <>2014-05-17 15:45:50 +0000
commitf9e51a39925ce6e0ee20ac56375dba268cf7c8bd (patch)
tree3534ea361ab64479dab8d3b6cc02a6619caaedec /src
parent1ceb1e2391a5ef5b4ebb8a4edd795674fac9ed9a (diff)
downloadopenbsd-f9e51a39925ce6e0ee20ac56375dba268cf7c8bd.tar.gz
openbsd-f9e51a39925ce6e0ee20ac56375dba268cf7c8bd.tar.bz2
openbsd-f9e51a39925ce6e0ee20ac56375dba268cf7c8bd.zip
deleted seed some time ago
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/s3_lib.c101
-rw-r--r--src/lib/libssl/src/apps/cms.c7
-rw-r--r--src/lib/libssl/src/apps/dsa.c3
-rw-r--r--src/lib/libssl/src/apps/gendsa.c8
-rw-r--r--src/lib/libssl/src/apps/genrsa.c8
-rw-r--r--src/lib/libssl/src/apps/pkcs12.c7
-rw-r--r--src/lib/libssl/src/apps/progs.h7
-rw-r--r--src/lib/libssl/src/apps/rsa.c3
-rw-r--r--src/lib/libssl/src/apps/smime.c7
-rw-r--r--src/lib/libssl/src/apps/speed.c35
-rw-r--r--src/lib/libssl/src/ssl/s3_lib.c101
-rw-r--r--src/lib/libssl/src/ssl/ssl_algs.c4
-rw-r--r--src/lib/libssl/ssl_algs.c4
13 files changed, 0 insertions, 295 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index c68748809c..293866afee 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1327,107 +1327,6 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
1327 }, 1327 },
1328#endif /* OPENSSL_NO_PSK */ 1328#endif /* OPENSSL_NO_PSK */
1329 1329
1330#ifndef OPENSSL_NO_SEED
1331 /* SEED ciphersuites from RFC4162 */
1332
1333 /* Cipher 96 */
1334 {
1335 1,
1336 TLS1_TXT_RSA_WITH_SEED_SHA,
1337 TLS1_CK_RSA_WITH_SEED_SHA,
1338 SSL_kRSA,
1339 SSL_aRSA,
1340 SSL_SEED,
1341 SSL_SHA1,
1342 SSL_TLSV1,
1343 SSL_NOT_EXP|SSL_MEDIUM,
1344 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1345 128,
1346 128,
1347 },
1348
1349 /* Cipher 97 */
1350 {
1351 0, /* not implemented (non-ephemeral DH) */
1352 TLS1_TXT_DH_DSS_WITH_SEED_SHA,
1353 TLS1_CK_DH_DSS_WITH_SEED_SHA,
1354 SSL_kDHd,
1355 SSL_aDH,
1356 SSL_SEED,
1357 SSL_SHA1,
1358 SSL_TLSV1,
1359 SSL_NOT_EXP|SSL_MEDIUM,
1360 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1361 128,
1362 128,
1363 },
1364
1365 /* Cipher 98 */
1366 {
1367 0, /* not implemented (non-ephemeral DH) */
1368 TLS1_TXT_DH_RSA_WITH_SEED_SHA,
1369 TLS1_CK_DH_RSA_WITH_SEED_SHA,
1370 SSL_kDHr,
1371 SSL_aDH,
1372 SSL_SEED,
1373 SSL_SHA1,
1374 SSL_TLSV1,
1375 SSL_NOT_EXP|SSL_MEDIUM,
1376 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1377 128,
1378 128,
1379 },
1380
1381 /* Cipher 99 */
1382 {
1383 1,
1384 TLS1_TXT_DHE_DSS_WITH_SEED_SHA,
1385 TLS1_CK_DHE_DSS_WITH_SEED_SHA,
1386 SSL_kEDH,
1387 SSL_aDSS,
1388 SSL_SEED,
1389 SSL_SHA1,
1390 SSL_TLSV1,
1391 SSL_NOT_EXP|SSL_MEDIUM,
1392 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1393 128,
1394 128,
1395 },
1396
1397 /* Cipher 9A */
1398 {
1399 1,
1400 TLS1_TXT_DHE_RSA_WITH_SEED_SHA,
1401 TLS1_CK_DHE_RSA_WITH_SEED_SHA,
1402 SSL_kEDH,
1403 SSL_aRSA,
1404 SSL_SEED,
1405 SSL_SHA1,
1406 SSL_TLSV1,
1407 SSL_NOT_EXP|SSL_MEDIUM,
1408 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1409 128,
1410 128,
1411 },
1412
1413 /* Cipher 9B */
1414 {
1415 1,
1416 TLS1_TXT_ADH_WITH_SEED_SHA,
1417 TLS1_CK_ADH_WITH_SEED_SHA,
1418 SSL_kEDH,
1419 SSL_aNULL,
1420 SSL_SEED,
1421 SSL_SHA1,
1422 SSL_TLSV1,
1423 SSL_NOT_EXP|SSL_MEDIUM,
1424 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1425 128,
1426 128,
1427 },
1428
1429#endif /* OPENSSL_NO_SEED */
1430
1431 /* GCM ciphersuites from RFC5288 */ 1330 /* GCM ciphersuites from RFC5288 */
1432 1331
1433 /* Cipher 9C */ 1332 /* Cipher 9C */
diff --git a/src/lib/libssl/src/apps/cms.c b/src/lib/libssl/src/apps/cms.c
index aa59b28e86..03459c64a2 100644
--- a/src/lib/libssl/src/apps/cms.c
+++ b/src/lib/libssl/src/apps/cms.c
@@ -198,10 +198,6 @@ cms_main(int argc, char **argv)
198 else if (!strcmp(*args, "-des")) 198 else if (!strcmp(*args, "-des"))
199 cipher = EVP_des_cbc(); 199 cipher = EVP_des_cbc();
200#endif 200#endif
201#ifndef OPENSSL_NO_SEED
202 else if (!strcmp(*args, "-seed"))
203 cipher = EVP_seed_cbc();
204#endif
205#ifndef OPENSSL_NO_RC2 201#ifndef OPENSSL_NO_RC2
206 else if (!strcmp(*args, "-rc2-40")) 202 else if (!strcmp(*args, "-rc2-40"))
207 cipher = EVP_rc2_40_cbc(); 203 cipher = EVP_rc2_40_cbc();
@@ -518,9 +514,6 @@ argerr:
518 BIO_printf(bio_err, "-des3 encrypt with triple DES\n"); 514 BIO_printf(bio_err, "-des3 encrypt with triple DES\n");
519 BIO_printf(bio_err, "-des encrypt with DES\n"); 515 BIO_printf(bio_err, "-des encrypt with DES\n");
520#endif 516#endif
521#ifndef OPENSSL_NO_SEED
522 BIO_printf(bio_err, "-seed encrypt with SEED\n");
523#endif
524#ifndef OPENSSL_NO_RC2 517#ifndef OPENSSL_NO_RC2
525 BIO_printf(bio_err, "-rc2-40 encrypt with RC2-40 (default)\n"); 518 BIO_printf(bio_err, "-rc2-40 encrypt with RC2-40 (default)\n");
526 BIO_printf(bio_err, "-rc2-64 encrypt with RC2-64\n"); 519 BIO_printf(bio_err, "-rc2-64 encrypt with RC2-64\n");
diff --git a/src/lib/libssl/src/apps/dsa.c b/src/lib/libssl/src/apps/dsa.c
index 2a27365adf..f9be2392d8 100644
--- a/src/lib/libssl/src/apps/dsa.c
+++ b/src/lib/libssl/src/apps/dsa.c
@@ -217,9 +217,6 @@ bad:
217 BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n"); 217 BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");
218 BIO_printf(bio_err, " encrypt PEM output with cbc camellia\n"); 218 BIO_printf(bio_err, " encrypt PEM output with cbc camellia\n");
219#endif 219#endif
220#ifndef OPENSSL_NO_SEED
221 BIO_printf(bio_err, " -seed encrypt PEM output with cbc seed\n");
222#endif
223 BIO_printf(bio_err, " -text print the key in text\n"); 220 BIO_printf(bio_err, " -text print the key in text\n");
224 BIO_printf(bio_err, " -noout don't print key out\n"); 221 BIO_printf(bio_err, " -noout don't print key out\n");
225 BIO_printf(bio_err, " -modulus print the DSA public value\n"); 222 BIO_printf(bio_err, " -modulus print the DSA public value\n");
diff --git a/src/lib/libssl/src/apps/gendsa.c b/src/lib/libssl/src/apps/gendsa.c
index 8a0d3ecbed..07eb756372 100644
--- a/src/lib/libssl/src/apps/gendsa.c
+++ b/src/lib/libssl/src/apps/gendsa.c
@@ -134,10 +134,6 @@ gendsa_main(int argc, char **argv)
134 else if (strcmp(*argv, "-idea") == 0) 134 else if (strcmp(*argv, "-idea") == 0)
135 enc = EVP_idea_cbc(); 135 enc = EVP_idea_cbc();
136#endif 136#endif
137#ifndef OPENSSL_NO_SEED
138 else if (strcmp(*argv, "-seed") == 0)
139 enc = EVP_seed_cbc();
140#endif
141#ifndef OPENSSL_NO_AES 137#ifndef OPENSSL_NO_AES
142 else if (strcmp(*argv, "-aes128") == 0) 138 else if (strcmp(*argv, "-aes128") == 0)
143 enc = EVP_aes_128_cbc(); 139 enc = EVP_aes_128_cbc();
@@ -173,10 +169,6 @@ bad:
173#ifndef OPENSSL_NO_IDEA 169#ifndef OPENSSL_NO_IDEA
174 BIO_printf(bio_err, " -idea - encrypt the generated key with IDEA in cbc mode\n"); 170 BIO_printf(bio_err, " -idea - encrypt the generated key with IDEA in cbc mode\n");
175#endif 171#endif
176#ifndef OPENSSL_NO_SEED
177 BIO_printf(bio_err, " -seed\n");
178 BIO_printf(bio_err, " encrypt PEM output with cbc seed\n");
179#endif
180#ifndef OPENSSL_NO_AES 172#ifndef OPENSSL_NO_AES
181 BIO_printf(bio_err, " -aes128, -aes192, -aes256\n"); 173 BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
182 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n"); 174 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n");
diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c
index 88c80f2b66..643e20da2f 100644
--- a/src/lib/libssl/src/apps/genrsa.c
+++ b/src/lib/libssl/src/apps/genrsa.c
@@ -157,10 +157,6 @@ genrsa_main(int argc, char **argv)
157 else if (strcmp(*argv, "-idea") == 0) 157 else if (strcmp(*argv, "-idea") == 0)
158 enc = EVP_idea_cbc(); 158 enc = EVP_idea_cbc();
159#endif 159#endif
160#ifndef OPENSSL_NO_SEED
161 else if (strcmp(*argv, "-seed") == 0)
162 enc = EVP_seed_cbc();
163#endif
164#ifndef OPENSSL_NO_AES 160#ifndef OPENSSL_NO_AES
165 else if (strcmp(*argv, "-aes128") == 0) 161 else if (strcmp(*argv, "-aes128") == 0)
166 enc = EVP_aes_128_cbc(); 162 enc = EVP_aes_128_cbc();
@@ -194,10 +190,6 @@ bad:
194#ifndef OPENSSL_NO_IDEA 190#ifndef OPENSSL_NO_IDEA
195 BIO_printf(bio_err, " -idea encrypt the generated key with IDEA in cbc mode\n"); 191 BIO_printf(bio_err, " -idea encrypt the generated key with IDEA in cbc mode\n");
196#endif 192#endif
197#ifndef OPENSSL_NO_SEED
198 BIO_printf(bio_err, " -seed\n");
199 BIO_printf(bio_err, " encrypt PEM output with cbc seed\n");
200#endif
201#ifndef OPENSSL_NO_AES 193#ifndef OPENSSL_NO_AES
202 BIO_printf(bio_err, " -aes128, -aes192, -aes256\n"); 194 BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
203 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n"); 195 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n");
diff --git a/src/lib/libssl/src/apps/pkcs12.c b/src/lib/libssl/src/apps/pkcs12.c
index 55a5779360..8ea749616d 100644
--- a/src/lib/libssl/src/apps/pkcs12.c
+++ b/src/lib/libssl/src/apps/pkcs12.c
@@ -180,10 +180,6 @@ pkcs12_main(int argc, char **argv)
180 else if (!strcmp(*args, "-idea")) 180 else if (!strcmp(*args, "-idea"))
181 enc = EVP_idea_cbc(); 181 enc = EVP_idea_cbc();
182#endif 182#endif
183#ifndef OPENSSL_NO_SEED
184 else if (!strcmp(*args, "-seed"))
185 enc = EVP_seed_cbc();
186#endif
187#ifndef OPENSSL_NO_AES 183#ifndef OPENSSL_NO_AES
188 else if (!strcmp(*args, "-aes128")) 184 else if (!strcmp(*args, "-aes128"))
189 enc = EVP_aes_128_cbc(); 185 enc = EVP_aes_128_cbc();
@@ -346,9 +342,6 @@ pkcs12_main(int argc, char **argv)
346#ifndef OPENSSL_NO_IDEA 342#ifndef OPENSSL_NO_IDEA
347 BIO_printf(bio_err, "-idea encrypt private keys with idea\n"); 343 BIO_printf(bio_err, "-idea encrypt private keys with idea\n");
348#endif 344#endif
349#ifndef OPENSSL_NO_SEED
350 BIO_printf(bio_err, "-seed encrypt private keys with seed\n");
351#endif
352#ifndef OPENSSL_NO_AES 345#ifndef OPENSSL_NO_AES
353 BIO_printf(bio_err, "-aes128, -aes192, -aes256\n"); 346 BIO_printf(bio_err, "-aes128, -aes192, -aes256\n");
354 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n"); 347 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n");
diff --git a/src/lib/libssl/src/apps/progs.h b/src/lib/libssl/src/apps/progs.h
index df00b71939..c6f66b585f 100644
--- a/src/lib/libssl/src/apps/progs.h
+++ b/src/lib/libssl/src/apps/progs.h
@@ -230,13 +230,6 @@ FUNCTION functions[] = {
230 { FUNC_TYPE_CIPHER, "rc5-cfb", enc_main }, 230 { FUNC_TYPE_CIPHER, "rc5-cfb", enc_main },
231 { FUNC_TYPE_CIPHER, "rc5-ofb", enc_main }, 231 { FUNC_TYPE_CIPHER, "rc5-ofb", enc_main },
232#endif 232#endif
233#ifndef OPENSSL_NO_SEED
234 { FUNC_TYPE_CIPHER, "seed", enc_main },
235 { FUNC_TYPE_CIPHER, "seed-cbc", enc_main },
236 { FUNC_TYPE_CIPHER, "seed-ecb", enc_main },
237 { FUNC_TYPE_CIPHER, "seed-cfb", enc_main },
238 { FUNC_TYPE_CIPHER, "seed-ofb", enc_main },
239#endif
240#ifdef ZLIB 233#ifdef ZLIB
241 { FUNC_TYPE_CIPHER, "zlib", enc_main }, 234 { FUNC_TYPE_CIPHER, "zlib", enc_main },
242#endif 235#endif
diff --git a/src/lib/libssl/src/apps/rsa.c b/src/lib/libssl/src/apps/rsa.c
index 21bc3ba93c..286183582a 100644
--- a/src/lib/libssl/src/apps/rsa.c
+++ b/src/lib/libssl/src/apps/rsa.c
@@ -215,9 +215,6 @@ bad:
215#ifndef OPENSSL_NO_IDEA 215#ifndef OPENSSL_NO_IDEA
216 BIO_printf(bio_err, " -idea encrypt PEM output with cbc idea\n"); 216 BIO_printf(bio_err, " -idea encrypt PEM output with cbc idea\n");
217#endif 217#endif
218#ifndef OPENSSL_NO_SEED
219 BIO_printf(bio_err, " -seed encrypt PEM output with cbc seed\n");
220#endif
221#ifndef OPENSSL_NO_AES 218#ifndef OPENSSL_NO_AES
222 BIO_printf(bio_err, " -aes128, -aes192, -aes256\n"); 219 BIO_printf(bio_err, " -aes128, -aes192, -aes256\n");
223 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n"); 220 BIO_printf(bio_err, " encrypt PEM output with cbc aes\n");
diff --git a/src/lib/libssl/src/apps/smime.c b/src/lib/libssl/src/apps/smime.c
index a241231b08..4fdf170df7 100644
--- a/src/lib/libssl/src/apps/smime.c
+++ b/src/lib/libssl/src/apps/smime.c
@@ -148,10 +148,6 @@ smime_main(int argc, char **argv)
148 else if (!strcmp(*args, "-des")) 148 else if (!strcmp(*args, "-des"))
149 cipher = EVP_des_cbc(); 149 cipher = EVP_des_cbc();
150#endif 150#endif
151#ifndef OPENSSL_NO_SEED
152 else if (!strcmp(*args, "-seed"))
153 cipher = EVP_seed_cbc();
154#endif
155#ifndef OPENSSL_NO_RC2 151#ifndef OPENSSL_NO_RC2
156 else if (!strcmp(*args, "-rc2-40")) 152 else if (!strcmp(*args, "-rc2-40"))
157 cipher = EVP_rc2_40_cbc(); 153 cipher = EVP_rc2_40_cbc();
@@ -378,9 +374,6 @@ argerr:
378 BIO_printf(bio_err, "-des3 encrypt with triple DES\n"); 374 BIO_printf(bio_err, "-des3 encrypt with triple DES\n");
379 BIO_printf(bio_err, "-des encrypt with DES\n"); 375 BIO_printf(bio_err, "-des encrypt with DES\n");
380#endif 376#endif
381#ifndef OPENSSL_NO_SEED
382 BIO_printf(bio_err, "-seed encrypt with SEED\n");
383#endif
384#ifndef OPENSSL_NO_RC2 377#ifndef OPENSSL_NO_RC2
385 BIO_printf(bio_err, "-rc2-40 encrypt with RC2-40 (default)\n"); 378 BIO_printf(bio_err, "-rc2-40 encrypt with RC2-40 (default)\n");
386 BIO_printf(bio_err, "-rc2-64 encrypt with RC2-64\n"); 379 BIO_printf(bio_err, "-rc2-64 encrypt with RC2-64\n");
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c
index 83564be6fd..c8ed39d1f6 100644
--- a/src/lib/libssl/src/apps/speed.c
+++ b/src/lib/libssl/src/apps/speed.c
@@ -155,9 +155,6 @@
155#ifndef OPENSSL_NO_RIPEMD 155#ifndef OPENSSL_NO_RIPEMD
156#include <openssl/ripemd.h> 156#include <openssl/ripemd.h>
157#endif 157#endif
158#ifndef OPENSSL_NO_SEED
159#include <openssl/seed.h>
160#endif
161#ifndef OPENSSL_NO_SHA 158#ifndef OPENSSL_NO_SHA
162#include <openssl/sha.h> 159#include <openssl/sha.h>
163#endif 160#endif
@@ -313,9 +310,6 @@ speed_main(int argc, char **argv)
313#ifndef OPENSSL_NO_IDEA 310#ifndef OPENSSL_NO_IDEA
314 IDEA_KEY_SCHEDULE idea_ks; 311 IDEA_KEY_SCHEDULE idea_ks;
315#endif 312#endif
316#ifndef OPENSSL_NO_SEED
317 SEED_KEY_SCHEDULE seed_ks;
318#endif
319#ifndef OPENSSL_NO_BF 313#ifndef OPENSSL_NO_BF
320 BF_KEY bf_ks; 314 BF_KEY bf_ks;
321#endif 315#endif
@@ -802,13 +796,6 @@ speed_main(int argc, char **argv)
802 doit[D_CBC_IDEA] = 1; 796 doit[D_CBC_IDEA] = 1;
803 else 797 else
804#endif 798#endif
805#ifndef OPENSSL_NO_SEED
806 if (strcmp(*argv, "seed-cbc") == 0)
807 doit[D_CBC_SEED] = 1;
808 else if (strcmp(*argv, "seed") == 0)
809 doit[D_CBC_SEED] = 1;
810 else
811#endif
812#ifndef OPENSSL_NO_BF 799#ifndef OPENSSL_NO_BF
813 if (strcmp(*argv, "bf-cbc") == 0) 800 if (strcmp(*argv, "bf-cbc") == 0)
814 doit[D_CBC_BF] = 1; 801 doit[D_CBC_BF] = 1;
@@ -984,9 +971,6 @@ speed_main(int argc, char **argv)
984#ifndef OPENSSL_NO_IDEA 971#ifndef OPENSSL_NO_IDEA
985 BIO_printf(bio_err, "idea-cbc "); 972 BIO_printf(bio_err, "idea-cbc ");
986#endif 973#endif
987#ifndef OPENSSL_NO_SEED
988 BIO_printf(bio_err, "seed-cbc ");
989#endif
990#ifndef OPENSSL_NO_RC2 974#ifndef OPENSSL_NO_RC2
991 BIO_printf(bio_err, "rc2-cbc "); 975 BIO_printf(bio_err, "rc2-cbc ");
992#endif 976#endif
@@ -1039,9 +1023,6 @@ speed_main(int argc, char **argv)
1039#ifndef OPENSSL_NO_IDEA 1023#ifndef OPENSSL_NO_IDEA
1040 BIO_printf(bio_err, "idea "); 1024 BIO_printf(bio_err, "idea ");
1041#endif 1025#endif
1042#ifndef OPENSSL_NO_SEED
1043 BIO_printf(bio_err, "seed ");
1044#endif
1045#ifndef OPENSSL_NO_RC2 1026#ifndef OPENSSL_NO_RC2
1046 BIO_printf(bio_err, "rc2 "); 1027 BIO_printf(bio_err, "rc2 ");
1047#endif 1028#endif
@@ -1160,9 +1141,6 @@ speed_main(int argc, char **argv)
1160#ifndef OPENSSL_NO_IDEA 1141#ifndef OPENSSL_NO_IDEA
1161 idea_set_encrypt_key(key16, &idea_ks); 1142 idea_set_encrypt_key(key16, &idea_ks);
1162#endif 1143#endif
1163#ifndef OPENSSL_NO_SEED
1164 SEED_set_key(key16, &seed_ks);
1165#endif
1166#ifndef OPENSSL_NO_RC4 1144#ifndef OPENSSL_NO_RC4
1167 RC4_set_key(&rc4_ks, 16, key16); 1145 RC4_set_key(&rc4_ks, 16, key16);
1168#endif 1146#endif
@@ -1499,19 +1477,6 @@ speed_main(int argc, char **argv)
1499 } 1477 }
1500 } 1478 }
1501#endif 1479#endif
1502#ifndef OPENSSL_NO_SEED
1503 if (doit[D_CBC_SEED]) {
1504 for (j = 0; j < SIZE_NUM; j++) {
1505 print_message(names[D_CBC_SEED], c[D_CBC_SEED][j], lengths[j]);
1506 Time_F(START);
1507 for (count = 0, run = 1; COND(c[D_CBC_SEED][j]); count++)
1508 SEED_cbc_encrypt(buf, buf,
1509 (unsigned long) lengths[j], &seed_ks, iv, 1);
1510 d = Time_F(STOP);
1511 print_result(D_CBC_SEED, j, count, d);
1512 }
1513 }
1514#endif
1515#ifndef OPENSSL_NO_RC2 1480#ifndef OPENSSL_NO_RC2
1516 if (doit[D_CBC_RC2]) { 1481 if (doit[D_CBC_RC2]) {
1517 for (j = 0; j < SIZE_NUM; j++) { 1482 for (j = 0; j < SIZE_NUM; j++) {
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index c68748809c..293866afee 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -1327,107 +1327,6 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
1327 }, 1327 },
1328#endif /* OPENSSL_NO_PSK */ 1328#endif /* OPENSSL_NO_PSK */
1329 1329
1330#ifndef OPENSSL_NO_SEED
1331 /* SEED ciphersuites from RFC4162 */
1332
1333 /* Cipher 96 */
1334 {
1335 1,
1336 TLS1_TXT_RSA_WITH_SEED_SHA,
1337 TLS1_CK_RSA_WITH_SEED_SHA,
1338 SSL_kRSA,
1339 SSL_aRSA,
1340 SSL_SEED,
1341 SSL_SHA1,
1342 SSL_TLSV1,
1343 SSL_NOT_EXP|SSL_MEDIUM,
1344 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1345 128,
1346 128,
1347 },
1348
1349 /* Cipher 97 */
1350 {
1351 0, /* not implemented (non-ephemeral DH) */
1352 TLS1_TXT_DH_DSS_WITH_SEED_SHA,
1353 TLS1_CK_DH_DSS_WITH_SEED_SHA,
1354 SSL_kDHd,
1355 SSL_aDH,
1356 SSL_SEED,
1357 SSL_SHA1,
1358 SSL_TLSV1,
1359 SSL_NOT_EXP|SSL_MEDIUM,
1360 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1361 128,
1362 128,
1363 },
1364
1365 /* Cipher 98 */
1366 {
1367 0, /* not implemented (non-ephemeral DH) */
1368 TLS1_TXT_DH_RSA_WITH_SEED_SHA,
1369 TLS1_CK_DH_RSA_WITH_SEED_SHA,
1370 SSL_kDHr,
1371 SSL_aDH,
1372 SSL_SEED,
1373 SSL_SHA1,
1374 SSL_TLSV1,
1375 SSL_NOT_EXP|SSL_MEDIUM,
1376 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1377 128,
1378 128,
1379 },
1380
1381 /* Cipher 99 */
1382 {
1383 1,
1384 TLS1_TXT_DHE_DSS_WITH_SEED_SHA,
1385 TLS1_CK_DHE_DSS_WITH_SEED_SHA,
1386 SSL_kEDH,
1387 SSL_aDSS,
1388 SSL_SEED,
1389 SSL_SHA1,
1390 SSL_TLSV1,
1391 SSL_NOT_EXP|SSL_MEDIUM,
1392 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1393 128,
1394 128,
1395 },
1396
1397 /* Cipher 9A */
1398 {
1399 1,
1400 TLS1_TXT_DHE_RSA_WITH_SEED_SHA,
1401 TLS1_CK_DHE_RSA_WITH_SEED_SHA,
1402 SSL_kEDH,
1403 SSL_aRSA,
1404 SSL_SEED,
1405 SSL_SHA1,
1406 SSL_TLSV1,
1407 SSL_NOT_EXP|SSL_MEDIUM,
1408 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1409 128,
1410 128,
1411 },
1412
1413 /* Cipher 9B */
1414 {
1415 1,
1416 TLS1_TXT_ADH_WITH_SEED_SHA,
1417 TLS1_CK_ADH_WITH_SEED_SHA,
1418 SSL_kEDH,
1419 SSL_aNULL,
1420 SSL_SEED,
1421 SSL_SHA1,
1422 SSL_TLSV1,
1423 SSL_NOT_EXP|SSL_MEDIUM,
1424 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1425 128,
1426 128,
1427 },
1428
1429#endif /* OPENSSL_NO_SEED */
1430
1431 /* GCM ciphersuites from RFC5288 */ 1330 /* GCM ciphersuites from RFC5288 */
1432 1331
1433 /* Cipher 9C */ 1332 /* Cipher 9C */
diff --git a/src/lib/libssl/src/ssl/ssl_algs.c b/src/lib/libssl/src/ssl/ssl_algs.c
index 3c7006ed91..46b3c41351 100644
--- a/src/lib/libssl/src/ssl/ssl_algs.c
+++ b/src/lib/libssl/src/ssl/ssl_algs.c
@@ -97,10 +97,6 @@ SSL_library_init(void)
97 EVP_add_cipher(EVP_camellia_256_cbc()); 97 EVP_add_cipher(EVP_camellia_256_cbc());
98#endif 98#endif
99 99
100#ifndef OPENSSL_NO_SEED
101 EVP_add_cipher(EVP_seed_cbc());
102#endif
103
104 EVP_add_digest(EVP_md5()); 100 EVP_add_digest(EVP_md5());
105 EVP_add_digest_alias(SN_md5, "ssl2-md5"); 101 EVP_add_digest_alias(SN_md5, "ssl2-md5");
106 EVP_add_digest_alias(SN_md5, "ssl3-md5"); 102 EVP_add_digest_alias(SN_md5, "ssl3-md5");
diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c
index 3c7006ed91..46b3c41351 100644
--- a/src/lib/libssl/ssl_algs.c
+++ b/src/lib/libssl/ssl_algs.c
@@ -97,10 +97,6 @@ SSL_library_init(void)
97 EVP_add_cipher(EVP_camellia_256_cbc()); 97 EVP_add_cipher(EVP_camellia_256_cbc());
98#endif 98#endif
99 99
100#ifndef OPENSSL_NO_SEED
101 EVP_add_cipher(EVP_seed_cbc());
102#endif
103
104 EVP_add_digest(EVP_md5()); 100 EVP_add_digest(EVP_md5());
105 EVP_add_digest_alias(SN_md5, "ssl2-md5"); 101 EVP_add_digest_alias(SN_md5, "ssl2-md5");
106 EVP_add_digest_alias(SN_md5, "ssl3-md5"); 102 EVP_add_digest_alias(SN_md5, "ssl3-md5");
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 00:45:44 +0000