summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c2247
1 files changed, 772 insertions, 1475 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index d6b047c995..5aa7bb21da 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -56,7 +56,7 @@
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58/* ==================================================================== 58/* ====================================================================
59 * Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved. 59 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
60 * 60 *
61 * Redistribution and use in source and binary forms, with or without 61 * Redistribution and use in source and binary forms, with or without
62 * modification, are permitted provided that the following conditions 62 * modification, are permitted provided that the following conditions
@@ -121,46 +121,16 @@
121 * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories. 121 * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
122 * 122 *
123 */ 123 */
124/* ====================================================================
125 * Copyright 2005 Nokia. All rights reserved.
126 *
127 * The portions of the attached software ("Contribution") is developed by
128 * Nokia Corporation and is licensed pursuant to the OpenSSL open source
129 * license.
130 *
131 * The Contribution, originally written by Mika Kousa and Pasi Eronen of
132 * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
133 * support (see RFC 4279) to OpenSSL.
134 *
135 * No patent licenses or other rights except those expressly stated in
136 * the OpenSSL open source license shall be deemed granted or received
137 * expressly, by implication, estoppel, or otherwise.
138 *
139 * No assurances are provided by Nokia that the Contribution does not
140 * infringe the patent or other intellectual property rights of any third
141 * party or that the license provides you with all the necessary rights
142 * to make use of the Contribution.
143 *
144 * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
145 * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
146 * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
147 * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
148 * OTHERWISE.
149 */
150 124
151#include <stdio.h> 125#include <stdio.h>
152#include <openssl/objects.h> 126#include <openssl/objects.h>
153#include "ssl_locl.h" 127#include "ssl_locl.h"
154#include "kssl_lcl.h" 128#include "kssl_lcl.h"
155#ifndef OPENSSL_NO_TLSEXT
156#ifndef OPENSSL_NO_EC
157#include "../crypto/ec/ec_lcl.h"
158#endif /* OPENSSL_NO_EC */
159#endif /* OPENSSL_NO_TLSEXT */
160#include <openssl/md5.h> 129#include <openssl/md5.h>
161#ifndef OPENSSL_NO_DH 130#ifndef OPENSSL_NO_DH
162#include <openssl/dh.h> 131#include <openssl/dh.h>
163#endif 132#endif
133#include <openssl/pq_compat.h>
164 134
165const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT; 135const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;
166 136
@@ -168,265 +138,217 @@ const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;
168 138
169/* list of available SSLv3 ciphers (sorted by id) */ 139/* list of available SSLv3 ciphers (sorted by id) */
170OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ 140OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
171
172/* The RSA ciphers */ 141/* The RSA ciphers */
173/* Cipher 01 */ 142/* Cipher 01 */
174 { 143 {
175 1, 144 1,
176 SSL3_TXT_RSA_NULL_MD5, 145 SSL3_TXT_RSA_NULL_MD5,
177 SSL3_CK_RSA_NULL_MD5, 146 SSL3_CK_RSA_NULL_MD5,
178 SSL_kRSA, 147 SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_MD5|SSL_SSLV3,
179 SSL_aRSA,
180 SSL_eNULL,
181 SSL_MD5,
182 SSL_SSLV3,
183 SSL_NOT_EXP|SSL_STRONG_NONE, 148 SSL_NOT_EXP|SSL_STRONG_NONE,
184 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
185 0, 149 0,
186 0, 150 0,
151 0,
152 SSL_ALL_CIPHERS,
153 SSL_ALL_STRENGTHS,
187 }, 154 },
188
189/* Cipher 02 */ 155/* Cipher 02 */
190 { 156 {
191 1, 157 1,
192 SSL3_TXT_RSA_NULL_SHA, 158 SSL3_TXT_RSA_NULL_SHA,
193 SSL3_CK_RSA_NULL_SHA, 159 SSL3_CK_RSA_NULL_SHA,
194 SSL_kRSA, 160 SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_SHA1|SSL_SSLV3,
195 SSL_aRSA,
196 SSL_eNULL,
197 SSL_SHA1,
198 SSL_SSLV3,
199 SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS, 161 SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
200 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
201 0, 162 0,
202 0, 163 0,
164 0,
165 SSL_ALL_CIPHERS,
166 SSL_ALL_STRENGTHS,
203 }, 167 },
204
205/* Cipher 03 */ 168/* Cipher 03 */
206 { 169 {
207 1, 170 1,
208 SSL3_TXT_RSA_RC4_40_MD5, 171 SSL3_TXT_RSA_RC4_40_MD5,
209 SSL3_CK_RSA_RC4_40_MD5, 172 SSL3_CK_RSA_RC4_40_MD5,
210 SSL_kRSA, 173 SSL_kRSA|SSL_aRSA|SSL_RC4 |SSL_MD5 |SSL_SSLV3,
211 SSL_aRSA,
212 SSL_RC4,
213 SSL_MD5,
214 SSL_SSLV3,
215 SSL_EXPORT|SSL_EXP40, 174 SSL_EXPORT|SSL_EXP40,
216 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 175 0,
217 40, 176 40,
218 128, 177 128,
178 SSL_ALL_CIPHERS,
179 SSL_ALL_STRENGTHS,
219 }, 180 },
220
221/* Cipher 04 */ 181/* Cipher 04 */
222 { 182 {
223 1, 183 1,
224 SSL3_TXT_RSA_RC4_128_MD5, 184 SSL3_TXT_RSA_RC4_128_MD5,
225 SSL3_CK_RSA_RC4_128_MD5, 185 SSL3_CK_RSA_RC4_128_MD5,
226 SSL_kRSA, 186 SSL_kRSA|SSL_aRSA|SSL_RC4 |SSL_MD5|SSL_SSLV3,
227 SSL_aRSA,
228 SSL_RC4,
229 SSL_MD5,
230 SSL_SSLV3,
231 SSL_NOT_EXP|SSL_MEDIUM, 187 SSL_NOT_EXP|SSL_MEDIUM,
232 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 188 0,
233 128, 189 128,
234 128, 190 128,
191 SSL_ALL_CIPHERS,
192 SSL_ALL_STRENGTHS,
235 }, 193 },
236
237/* Cipher 05 */ 194/* Cipher 05 */
238 { 195 {
239 1, 196 1,
240 SSL3_TXT_RSA_RC4_128_SHA, 197 SSL3_TXT_RSA_RC4_128_SHA,
241 SSL3_CK_RSA_RC4_128_SHA, 198 SSL3_CK_RSA_RC4_128_SHA,
242 SSL_kRSA, 199 SSL_kRSA|SSL_aRSA|SSL_RC4 |SSL_SHA1|SSL_SSLV3,
243 SSL_aRSA,
244 SSL_RC4,
245 SSL_SHA1,
246 SSL_SSLV3,
247 SSL_NOT_EXP|SSL_MEDIUM, 200 SSL_NOT_EXP|SSL_MEDIUM,
248 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 201 0,
249 128, 202 128,
250 128, 203 128,
204 SSL_ALL_CIPHERS,
205 SSL_ALL_STRENGTHS,
251 }, 206 },
252
253/* Cipher 06 */ 207/* Cipher 06 */
254 { 208 {
255 1, 209 1,
256 SSL3_TXT_RSA_RC2_40_MD5, 210 SSL3_TXT_RSA_RC2_40_MD5,
257 SSL3_CK_RSA_RC2_40_MD5, 211 SSL3_CK_RSA_RC2_40_MD5,
258 SSL_kRSA, 212 SSL_kRSA|SSL_aRSA|SSL_RC2 |SSL_MD5 |SSL_SSLV3,
259 SSL_aRSA,
260 SSL_RC2,
261 SSL_MD5,
262 SSL_SSLV3,
263 SSL_EXPORT|SSL_EXP40, 213 SSL_EXPORT|SSL_EXP40,
264 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 214 0,
265 40, 215 40,
266 128, 216 128,
217 SSL_ALL_CIPHERS,
218 SSL_ALL_STRENGTHS,
267 }, 219 },
268
269/* Cipher 07 */ 220/* Cipher 07 */
270#ifndef OPENSSL_NO_IDEA 221#ifndef OPENSSL_NO_IDEA
271 { 222 {
272 1, 223 1,
273 SSL3_TXT_RSA_IDEA_128_SHA, 224 SSL3_TXT_RSA_IDEA_128_SHA,
274 SSL3_CK_RSA_IDEA_128_SHA, 225 SSL3_CK_RSA_IDEA_128_SHA,
275 SSL_kRSA, 226 SSL_kRSA|SSL_aRSA|SSL_IDEA |SSL_SHA1|SSL_SSLV3,
276 SSL_aRSA,
277 SSL_IDEA,
278 SSL_SHA1,
279 SSL_SSLV3,
280 SSL_NOT_EXP|SSL_MEDIUM, 227 SSL_NOT_EXP|SSL_MEDIUM,
281 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 228 0,
282 128, 229 128,
283 128, 230 128,
231 SSL_ALL_CIPHERS,
232 SSL_ALL_STRENGTHS,
284 }, 233 },
285#endif 234#endif
286
287/* Cipher 08 */ 235/* Cipher 08 */
288 { 236 {
289 1, 237 1,
290 SSL3_TXT_RSA_DES_40_CBC_SHA, 238 SSL3_TXT_RSA_DES_40_CBC_SHA,
291 SSL3_CK_RSA_DES_40_CBC_SHA, 239 SSL3_CK_RSA_DES_40_CBC_SHA,
292 SSL_kRSA, 240 SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
293 SSL_aRSA,
294 SSL_DES,
295 SSL_SHA1,
296 SSL_SSLV3,
297 SSL_EXPORT|SSL_EXP40, 241 SSL_EXPORT|SSL_EXP40,
298 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 242 0,
299 40, 243 40,
300 56, 244 56,
245 SSL_ALL_CIPHERS,
246 SSL_ALL_STRENGTHS,
301 }, 247 },
302
303/* Cipher 09 */ 248/* Cipher 09 */
304 { 249 {
305 1, 250 1,
306 SSL3_TXT_RSA_DES_64_CBC_SHA, 251 SSL3_TXT_RSA_DES_64_CBC_SHA,
307 SSL3_CK_RSA_DES_64_CBC_SHA, 252 SSL3_CK_RSA_DES_64_CBC_SHA,
308 SSL_kRSA, 253 SSL_kRSA|SSL_aRSA|SSL_DES |SSL_SHA1|SSL_SSLV3,
309 SSL_aRSA,
310 SSL_DES,
311 SSL_SHA1,
312 SSL_SSLV3,
313 SSL_NOT_EXP|SSL_LOW, 254 SSL_NOT_EXP|SSL_LOW,
314 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 255 0,
315 56, 256 56,
316 56, 257 56,
258 SSL_ALL_CIPHERS,
259 SSL_ALL_STRENGTHS,
317 }, 260 },
318
319/* Cipher 0A */ 261/* Cipher 0A */
320 { 262 {
321 1, 263 1,
322 SSL3_TXT_RSA_DES_192_CBC3_SHA, 264 SSL3_TXT_RSA_DES_192_CBC3_SHA,
323 SSL3_CK_RSA_DES_192_CBC3_SHA, 265 SSL3_CK_RSA_DES_192_CBC3_SHA,
324 SSL_kRSA, 266 SSL_kRSA|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_SSLV3,
325 SSL_aRSA,
326 SSL_3DES,
327 SSL_SHA1,
328 SSL_SSLV3,
329 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 267 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
330 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 268 0,
331 168, 269 168,
332 168, 270 168,
271 SSL_ALL_CIPHERS,
272 SSL_ALL_STRENGTHS,
333 }, 273 },
334
335/* The DH ciphers */ 274/* The DH ciphers */
336/* Cipher 0B */ 275/* Cipher 0B */
337 { 276 {
338 0, 277 0,
339 SSL3_TXT_DH_DSS_DES_40_CBC_SHA, 278 SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
340 SSL3_CK_DH_DSS_DES_40_CBC_SHA, 279 SSL3_CK_DH_DSS_DES_40_CBC_SHA,
341 SSL_kDHd, 280 SSL_kDHd |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
342 SSL_aDH,
343 SSL_DES,
344 SSL_SHA1,
345 SSL_SSLV3,
346 SSL_EXPORT|SSL_EXP40, 281 SSL_EXPORT|SSL_EXP40,
347 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 282 0,
348 40, 283 40,
349 56, 284 56,
285 SSL_ALL_CIPHERS,
286 SSL_ALL_STRENGTHS,
350 }, 287 },
351
352/* Cipher 0C */ 288/* Cipher 0C */
353 { 289 {
354 0, /* not implemented (non-ephemeral DH) */ 290 0,
355 SSL3_TXT_DH_DSS_DES_64_CBC_SHA, 291 SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
356 SSL3_CK_DH_DSS_DES_64_CBC_SHA, 292 SSL3_CK_DH_DSS_DES_64_CBC_SHA,
357 SSL_kDHd, 293 SSL_kDHd |SSL_aDH|SSL_DES |SSL_SHA1|SSL_SSLV3,
358 SSL_aDH,
359 SSL_DES,
360 SSL_SHA1,
361 SSL_SSLV3,
362 SSL_NOT_EXP|SSL_LOW, 294 SSL_NOT_EXP|SSL_LOW,
363 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 295 0,
364 56, 296 56,
365 56, 297 56,
298 SSL_ALL_CIPHERS,
299 SSL_ALL_STRENGTHS,
366 }, 300 },
367
368/* Cipher 0D */ 301/* Cipher 0D */
369 { 302 {
370 0, /* not implemented (non-ephemeral DH) */ 303 0,
371 SSL3_TXT_DH_DSS_DES_192_CBC3_SHA, 304 SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
372 SSL3_CK_DH_DSS_DES_192_CBC3_SHA, 305 SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
373 SSL_kDHd, 306 SSL_kDHd |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_SSLV3,
374 SSL_aDH,
375 SSL_3DES,
376 SSL_SHA1,
377 SSL_SSLV3,
378 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 307 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
379 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 308 0,
380 168, 309 168,
381 168, 310 168,
311 SSL_ALL_CIPHERS,
312 SSL_ALL_STRENGTHS,
382 }, 313 },
383
384/* Cipher 0E */ 314/* Cipher 0E */
385 { 315 {
386 0, /* not implemented (non-ephemeral DH) */ 316 0,
387 SSL3_TXT_DH_RSA_DES_40_CBC_SHA, 317 SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
388 SSL3_CK_DH_RSA_DES_40_CBC_SHA, 318 SSL3_CK_DH_RSA_DES_40_CBC_SHA,
389 SSL_kDHr, 319 SSL_kDHr |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
390 SSL_aDH,
391 SSL_DES,
392 SSL_SHA1,
393 SSL_SSLV3,
394 SSL_EXPORT|SSL_EXP40, 320 SSL_EXPORT|SSL_EXP40,
395 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 321 0,
396 40, 322 40,
397 56, 323 56,
324 SSL_ALL_CIPHERS,
325 SSL_ALL_STRENGTHS,
398 }, 326 },
399
400/* Cipher 0F */ 327/* Cipher 0F */
401 { 328 {
402 0, /* not implemented (non-ephemeral DH) */ 329 0,
403 SSL3_TXT_DH_RSA_DES_64_CBC_SHA, 330 SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
404 SSL3_CK_DH_RSA_DES_64_CBC_SHA, 331 SSL3_CK_DH_RSA_DES_64_CBC_SHA,
405 SSL_kDHr, 332 SSL_kDHr |SSL_aDH|SSL_DES |SSL_SHA1|SSL_SSLV3,
406 SSL_aDH,
407 SSL_DES,
408 SSL_SHA1,
409 SSL_SSLV3,
410 SSL_NOT_EXP|SSL_LOW, 333 SSL_NOT_EXP|SSL_LOW,
411 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 334 0,
412 56, 335 56,
413 56, 336 56,
337 SSL_ALL_CIPHERS,
338 SSL_ALL_STRENGTHS,
414 }, 339 },
415
416/* Cipher 10 */ 340/* Cipher 10 */
417 { 341 {
418 0, /* not implemented (non-ephemeral DH) */ 342 0,
419 SSL3_TXT_DH_RSA_DES_192_CBC3_SHA, 343 SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
420 SSL3_CK_DH_RSA_DES_192_CBC3_SHA, 344 SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
421 SSL_kDHr, 345 SSL_kDHr |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_SSLV3,
422 SSL_aDH,
423 SSL_3DES,
424 SSL_SHA1,
425 SSL_SSLV3,
426 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 346 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
427 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 347 0,
428 168, 348 168,
429 168, 349 168,
350 SSL_ALL_CIPHERS,
351 SSL_ALL_STRENGTHS,
430 }, 352 },
431 353
432/* The Ephemeral DH ciphers */ 354/* The Ephemeral DH ciphers */
@@ -435,193 +357,158 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
435 1, 357 1,
436 SSL3_TXT_EDH_DSS_DES_40_CBC_SHA, 358 SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
437 SSL3_CK_EDH_DSS_DES_40_CBC_SHA, 359 SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
438 SSL_kEDH, 360 SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA1|SSL_SSLV3,
439 SSL_aDSS,
440 SSL_DES,
441 SSL_SHA1,
442 SSL_SSLV3,
443 SSL_EXPORT|SSL_EXP40, 361 SSL_EXPORT|SSL_EXP40,
444 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 362 0,
445 40, 363 40,
446 56, 364 56,
365 SSL_ALL_CIPHERS,
366 SSL_ALL_STRENGTHS,
447 }, 367 },
448
449/* Cipher 12 */ 368/* Cipher 12 */
450 { 369 {
451 1, 370 1,
452 SSL3_TXT_EDH_DSS_DES_64_CBC_SHA, 371 SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
453 SSL3_CK_EDH_DSS_DES_64_CBC_SHA, 372 SSL3_CK_EDH_DSS_DES_64_CBC_SHA,
454 SSL_kEDH, 373 SSL_kEDH|SSL_aDSS|SSL_DES |SSL_SHA1|SSL_SSLV3,
455 SSL_aDSS,
456 SSL_DES,
457 SSL_SHA1,
458 SSL_SSLV3,
459 SSL_NOT_EXP|SSL_LOW, 374 SSL_NOT_EXP|SSL_LOW,
460 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 375 0,
461 56, 376 56,
462 56, 377 56,
378 SSL_ALL_CIPHERS,
379 SSL_ALL_STRENGTHS,
463 }, 380 },
464
465/* Cipher 13 */ 381/* Cipher 13 */
466 { 382 {
467 1, 383 1,
468 SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA, 384 SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,
469 SSL3_CK_EDH_DSS_DES_192_CBC3_SHA, 385 SSL3_CK_EDH_DSS_DES_192_CBC3_SHA,
470 SSL_kEDH, 386 SSL_kEDH|SSL_aDSS|SSL_3DES |SSL_SHA1|SSL_SSLV3,
471 SSL_aDSS,
472 SSL_3DES,
473 SSL_SHA1,
474 SSL_SSLV3,
475 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 387 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
476 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 388 0,
477 168, 389 168,
478 168, 390 168,
391 SSL_ALL_CIPHERS,
392 SSL_ALL_STRENGTHS,
479 }, 393 },
480
481/* Cipher 14 */ 394/* Cipher 14 */
482 { 395 {
483 1, 396 1,
484 SSL3_TXT_EDH_RSA_DES_40_CBC_SHA, 397 SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
485 SSL3_CK_EDH_RSA_DES_40_CBC_SHA, 398 SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
486 SSL_kEDH, 399 SSL_kEDH|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
487 SSL_aRSA,
488 SSL_DES,
489 SSL_SHA1,
490 SSL_SSLV3,
491 SSL_EXPORT|SSL_EXP40, 400 SSL_EXPORT|SSL_EXP40,
492 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 401 0,
493 40, 402 40,
494 56, 403 56,
404 SSL_ALL_CIPHERS,
405 SSL_ALL_STRENGTHS,
495 }, 406 },
496
497/* Cipher 15 */ 407/* Cipher 15 */
498 { 408 {
499 1, 409 1,
500 SSL3_TXT_EDH_RSA_DES_64_CBC_SHA, 410 SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
501 SSL3_CK_EDH_RSA_DES_64_CBC_SHA, 411 SSL3_CK_EDH_RSA_DES_64_CBC_SHA,
502 SSL_kEDH, 412 SSL_kEDH|SSL_aRSA|SSL_DES |SSL_SHA1|SSL_SSLV3,
503 SSL_aRSA,
504 SSL_DES,
505 SSL_SHA1,
506 SSL_SSLV3,
507 SSL_NOT_EXP|SSL_LOW, 413 SSL_NOT_EXP|SSL_LOW,
508 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 414 0,
509 56, 415 56,
510 56, 416 56,
417 SSL_ALL_CIPHERS,
418 SSL_ALL_STRENGTHS,
511 }, 419 },
512
513/* Cipher 16 */ 420/* Cipher 16 */
514 { 421 {
515 1, 422 1,
516 SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA, 423 SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,
517 SSL3_CK_EDH_RSA_DES_192_CBC3_SHA, 424 SSL3_CK_EDH_RSA_DES_192_CBC3_SHA,
518 SSL_kEDH, 425 SSL_kEDH|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_SSLV3,
519 SSL_aRSA,
520 SSL_3DES,
521 SSL_SHA1,
522 SSL_SSLV3,
523 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 426 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
524 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 427 0,
525 168, 428 168,
526 168, 429 168,
430 SSL_ALL_CIPHERS,
431 SSL_ALL_STRENGTHS,
527 }, 432 },
528
529/* Cipher 17 */ 433/* Cipher 17 */
530 { 434 {
531 1, 435 1,
532 SSL3_TXT_ADH_RC4_40_MD5, 436 SSL3_TXT_ADH_RC4_40_MD5,
533 SSL3_CK_ADH_RC4_40_MD5, 437 SSL3_CK_ADH_RC4_40_MD5,
534 SSL_kEDH, 438 SSL_kEDH |SSL_aNULL|SSL_RC4 |SSL_MD5 |SSL_SSLV3,
535 SSL_aNULL,
536 SSL_RC4,
537 SSL_MD5,
538 SSL_SSLV3,
539 SSL_EXPORT|SSL_EXP40, 439 SSL_EXPORT|SSL_EXP40,
540 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 440 0,
541 40, 441 40,
542 128, 442 128,
443 SSL_ALL_CIPHERS,
444 SSL_ALL_STRENGTHS,
543 }, 445 },
544
545/* Cipher 18 */ 446/* Cipher 18 */
546 { 447 {
547 1, 448 1,
548 SSL3_TXT_ADH_RC4_128_MD5, 449 SSL3_TXT_ADH_RC4_128_MD5,
549 SSL3_CK_ADH_RC4_128_MD5, 450 SSL3_CK_ADH_RC4_128_MD5,
550 SSL_kEDH, 451 SSL_kEDH |SSL_aNULL|SSL_RC4 |SSL_MD5 |SSL_SSLV3,
551 SSL_aNULL,
552 SSL_RC4,
553 SSL_MD5,
554 SSL_SSLV3,
555 SSL_NOT_EXP|SSL_MEDIUM, 452 SSL_NOT_EXP|SSL_MEDIUM,
556 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 453 0,
557 128, 454 128,
558 128, 455 128,
456 SSL_ALL_CIPHERS,
457 SSL_ALL_STRENGTHS,
559 }, 458 },
560
561/* Cipher 19 */ 459/* Cipher 19 */
562 { 460 {
563 1, 461 1,
564 SSL3_TXT_ADH_DES_40_CBC_SHA, 462 SSL3_TXT_ADH_DES_40_CBC_SHA,
565 SSL3_CK_ADH_DES_40_CBC_SHA, 463 SSL3_CK_ADH_DES_40_CBC_SHA,
566 SSL_kEDH, 464 SSL_kEDH |SSL_aNULL|SSL_DES|SSL_SHA1|SSL_SSLV3,
567 SSL_aNULL,
568 SSL_DES,
569 SSL_SHA1,
570 SSL_SSLV3,
571 SSL_EXPORT|SSL_EXP40, 465 SSL_EXPORT|SSL_EXP40,
572 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 466 0,
573 40, 467 40,
574 128, 468 128,
469 SSL_ALL_CIPHERS,
470 SSL_ALL_STRENGTHS,
575 }, 471 },
576
577/* Cipher 1A */ 472/* Cipher 1A */
578 { 473 {
579 1, 474 1,
580 SSL3_TXT_ADH_DES_64_CBC_SHA, 475 SSL3_TXT_ADH_DES_64_CBC_SHA,
581 SSL3_CK_ADH_DES_64_CBC_SHA, 476 SSL3_CK_ADH_DES_64_CBC_SHA,
582 SSL_kEDH, 477 SSL_kEDH |SSL_aNULL|SSL_DES |SSL_SHA1|SSL_SSLV3,
583 SSL_aNULL,
584 SSL_DES,
585 SSL_SHA1,
586 SSL_SSLV3,
587 SSL_NOT_EXP|SSL_LOW, 478 SSL_NOT_EXP|SSL_LOW,
588 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 479 0,
589 56, 480 56,
590 56, 481 56,
482 SSL_ALL_CIPHERS,
483 SSL_ALL_STRENGTHS,
591 }, 484 },
592
593/* Cipher 1B */ 485/* Cipher 1B */
594 { 486 {
595 1, 487 1,
596 SSL3_TXT_ADH_DES_192_CBC_SHA, 488 SSL3_TXT_ADH_DES_192_CBC_SHA,
597 SSL3_CK_ADH_DES_192_CBC_SHA, 489 SSL3_CK_ADH_DES_192_CBC_SHA,
598 SSL_kEDH, 490 SSL_kEDH |SSL_aNULL|SSL_3DES |SSL_SHA1|SSL_SSLV3,
599 SSL_aNULL,
600 SSL_3DES,
601 SSL_SHA1,
602 SSL_SSLV3,
603 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 491 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
604 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 492 0,
605 168, 493 168,
606 168, 494 168,
495 SSL_ALL_CIPHERS,
496 SSL_ALL_STRENGTHS,
607 }, 497 },
608 498
609/* Fortezza ciphersuite from SSL 3.0 spec */ 499/* Fortezza */
610#if 0
611/* Cipher 1C */ 500/* Cipher 1C */
612 { 501 {
613 0, 502 0,
614 SSL3_TXT_FZA_DMS_NULL_SHA, 503 SSL3_TXT_FZA_DMS_NULL_SHA,
615 SSL3_CK_FZA_DMS_NULL_SHA, 504 SSL3_CK_FZA_DMS_NULL_SHA,
616 SSL_kFZA, 505 SSL_kFZA|SSL_aFZA |SSL_eNULL |SSL_SHA1|SSL_SSLV3,
617 SSL_aFZA,
618 SSL_eNULL,
619 SSL_SHA1,
620 SSL_SSLV3,
621 SSL_NOT_EXP|SSL_STRONG_NONE, 506 SSL_NOT_EXP|SSL_STRONG_NONE,
622 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
623 0, 507 0,
624 0, 508 0,
509 0,
510 SSL_ALL_CIPHERS,
511 SSL_ALL_STRENGTHS,
625 }, 512 },
626 513
627/* Cipher 1D */ 514/* Cipher 1D */
@@ -629,50 +516,45 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
629 0, 516 0,
630 SSL3_TXT_FZA_DMS_FZA_SHA, 517 SSL3_TXT_FZA_DMS_FZA_SHA,
631 SSL3_CK_FZA_DMS_FZA_SHA, 518 SSL3_CK_FZA_DMS_FZA_SHA,
632 SSL_kFZA, 519 SSL_kFZA|SSL_aFZA |SSL_eFZA |SSL_SHA1|SSL_SSLV3,
633 SSL_aFZA,
634 SSL_eFZA,
635 SSL_SHA1,
636 SSL_SSLV3,
637 SSL_NOT_EXP|SSL_STRONG_NONE, 520 SSL_NOT_EXP|SSL_STRONG_NONE,
638 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
639 0, 521 0,
640 0, 522 0,
523 0,
524 SSL_ALL_CIPHERS,
525 SSL_ALL_STRENGTHS,
641 }, 526 },
642 527
528#if 0
643/* Cipher 1E */ 529/* Cipher 1E */
644 { 530 {
645 0, 531 0,
646 SSL3_TXT_FZA_DMS_RC4_SHA, 532 SSL3_TXT_FZA_DMS_RC4_SHA,
647 SSL3_CK_FZA_DMS_RC4_SHA, 533 SSL3_CK_FZA_DMS_RC4_SHA,
648 SSL_kFZA, 534 SSL_kFZA|SSL_aFZA |SSL_RC4 |SSL_SHA1|SSL_SSLV3,
649 SSL_aFZA,
650 SSL_RC4,
651 SSL_SHA1,
652 SSL_SSLV3,
653 SSL_NOT_EXP|SSL_MEDIUM, 535 SSL_NOT_EXP|SSL_MEDIUM,
654 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 536 0,
655 128, 537 128,
656 128, 538 128,
539 SSL_ALL_CIPHERS,
540 SSL_ALL_STRENGTHS,
657 }, 541 },
658#endif 542#endif
659 543
660#ifndef OPENSSL_NO_KRB5 544#ifndef OPENSSL_NO_KRB5
661/* The Kerberos ciphers*/ 545/* The Kerberos ciphers */
662/* Cipher 1E */ 546/* Cipher 1E */
663 { 547 {
664 1, 548 1,
665 SSL3_TXT_KRB5_DES_64_CBC_SHA, 549 SSL3_TXT_KRB5_DES_64_CBC_SHA,
666 SSL3_CK_KRB5_DES_64_CBC_SHA, 550 SSL3_CK_KRB5_DES_64_CBC_SHA,
667 SSL_kKRB5, 551 SSL_kKRB5|SSL_aKRB5| SSL_DES|SSL_SHA1 |SSL_SSLV3,
668 SSL_aKRB5,
669 SSL_DES,
670 SSL_SHA1,
671 SSL_SSLV3,
672 SSL_NOT_EXP|SSL_LOW, 552 SSL_NOT_EXP|SSL_LOW,
673 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 553 0,
674 56, 554 56,
675 56, 555 56,
556 SSL_ALL_CIPHERS,
557 SSL_ALL_STRENGTHS,
676 }, 558 },
677 559
678/* Cipher 1F */ 560/* Cipher 1F */
@@ -680,15 +562,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
680 1, 562 1,
681 SSL3_TXT_KRB5_DES_192_CBC3_SHA, 563 SSL3_TXT_KRB5_DES_192_CBC3_SHA,
682 SSL3_CK_KRB5_DES_192_CBC3_SHA, 564 SSL3_CK_KRB5_DES_192_CBC3_SHA,
683 SSL_kKRB5, 565 SSL_kKRB5|SSL_aKRB5| SSL_3DES|SSL_SHA1 |SSL_SSLV3,
684 SSL_aKRB5,
685 SSL_3DES,
686 SSL_SHA1,
687 SSL_SSLV3,
688 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 566 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
689 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 567 0,
690 168, 568 168,
691 168, 569 168,
570 SSL_ALL_CIPHERS,
571 SSL_ALL_STRENGTHS,
692 }, 572 },
693 573
694/* Cipher 20 */ 574/* Cipher 20 */
@@ -696,15 +576,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
696 1, 576 1,
697 SSL3_TXT_KRB5_RC4_128_SHA, 577 SSL3_TXT_KRB5_RC4_128_SHA,
698 SSL3_CK_KRB5_RC4_128_SHA, 578 SSL3_CK_KRB5_RC4_128_SHA,
699 SSL_kKRB5, 579 SSL_kKRB5|SSL_aKRB5| SSL_RC4|SSL_SHA1 |SSL_SSLV3,
700 SSL_aKRB5,
701 SSL_RC4,
702 SSL_SHA1,
703 SSL_SSLV3,
704 SSL_NOT_EXP|SSL_MEDIUM, 580 SSL_NOT_EXP|SSL_MEDIUM,
705 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 581 0,
706 128, 582 128,
707 128, 583 128,
584 SSL_ALL_CIPHERS,
585 SSL_ALL_STRENGTHS,
708 }, 586 },
709 587
710/* Cipher 21 */ 588/* Cipher 21 */
@@ -712,15 +590,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
712 1, 590 1,
713 SSL3_TXT_KRB5_IDEA_128_CBC_SHA, 591 SSL3_TXT_KRB5_IDEA_128_CBC_SHA,
714 SSL3_CK_KRB5_IDEA_128_CBC_SHA, 592 SSL3_CK_KRB5_IDEA_128_CBC_SHA,
715 SSL_kKRB5, 593 SSL_kKRB5|SSL_aKRB5| SSL_IDEA|SSL_SHA1 |SSL_SSLV3,
716 SSL_aKRB5,
717 SSL_IDEA,
718 SSL_SHA1,
719 SSL_SSLV3,
720 SSL_NOT_EXP|SSL_MEDIUM, 594 SSL_NOT_EXP|SSL_MEDIUM,
721 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 595 0,
722 128, 596 128,
723 128, 597 128,
598 SSL_ALL_CIPHERS,
599 SSL_ALL_STRENGTHS,
724 }, 600 },
725 601
726/* Cipher 22 */ 602/* Cipher 22 */
@@ -728,15 +604,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
728 1, 604 1,
729 SSL3_TXT_KRB5_DES_64_CBC_MD5, 605 SSL3_TXT_KRB5_DES_64_CBC_MD5,
730 SSL3_CK_KRB5_DES_64_CBC_MD5, 606 SSL3_CK_KRB5_DES_64_CBC_MD5,
731 SSL_kKRB5, 607 SSL_kKRB5|SSL_aKRB5| SSL_DES|SSL_MD5 |SSL_SSLV3,
732 SSL_aKRB5,
733 SSL_DES,
734 SSL_MD5,
735 SSL_SSLV3,
736 SSL_NOT_EXP|SSL_LOW, 608 SSL_NOT_EXP|SSL_LOW,
737 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 609 0,
738 56, 610 56,
739 56, 611 56,
612 SSL_ALL_CIPHERS,
613 SSL_ALL_STRENGTHS,
740 }, 614 },
741 615
742/* Cipher 23 */ 616/* Cipher 23 */
@@ -744,15 +618,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
744 1, 618 1,
745 SSL3_TXT_KRB5_DES_192_CBC3_MD5, 619 SSL3_TXT_KRB5_DES_192_CBC3_MD5,
746 SSL3_CK_KRB5_DES_192_CBC3_MD5, 620 SSL3_CK_KRB5_DES_192_CBC3_MD5,
747 SSL_kKRB5, 621 SSL_kKRB5|SSL_aKRB5| SSL_3DES|SSL_MD5 |SSL_SSLV3,
748 SSL_aKRB5,
749 SSL_3DES,
750 SSL_MD5,
751 SSL_SSLV3,
752 SSL_NOT_EXP|SSL_HIGH, 622 SSL_NOT_EXP|SSL_HIGH,
753 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 623 0,
754 168, 624 168,
755 168, 625 168,
626 SSL_ALL_CIPHERS,
627 SSL_ALL_STRENGTHS,
756 }, 628 },
757 629
758/* Cipher 24 */ 630/* Cipher 24 */
@@ -760,15 +632,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
760 1, 632 1,
761 SSL3_TXT_KRB5_RC4_128_MD5, 633 SSL3_TXT_KRB5_RC4_128_MD5,
762 SSL3_CK_KRB5_RC4_128_MD5, 634 SSL3_CK_KRB5_RC4_128_MD5,
763 SSL_kKRB5, 635 SSL_kKRB5|SSL_aKRB5| SSL_RC4|SSL_MD5 |SSL_SSLV3,
764 SSL_aKRB5,
765 SSL_RC4,
766 SSL_MD5,
767 SSL_SSLV3,
768 SSL_NOT_EXP|SSL_MEDIUM, 636 SSL_NOT_EXP|SSL_MEDIUM,
769 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 637 0,
770 128, 638 128,
771 128, 639 128,
640 SSL_ALL_CIPHERS,
641 SSL_ALL_STRENGTHS,
772 }, 642 },
773 643
774/* Cipher 25 */ 644/* Cipher 25 */
@@ -776,15 +646,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
776 1, 646 1,
777 SSL3_TXT_KRB5_IDEA_128_CBC_MD5, 647 SSL3_TXT_KRB5_IDEA_128_CBC_MD5,
778 SSL3_CK_KRB5_IDEA_128_CBC_MD5, 648 SSL3_CK_KRB5_IDEA_128_CBC_MD5,
779 SSL_kKRB5, 649 SSL_kKRB5|SSL_aKRB5| SSL_IDEA|SSL_MD5 |SSL_SSLV3,
780 SSL_aKRB5,
781 SSL_IDEA,
782 SSL_MD5,
783 SSL_SSLV3,
784 SSL_NOT_EXP|SSL_MEDIUM, 650 SSL_NOT_EXP|SSL_MEDIUM,
785 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 651 0,
786 128, 652 128,
787 128, 653 128,
654 SSL_ALL_CIPHERS,
655 SSL_ALL_STRENGTHS,
788 }, 656 },
789 657
790/* Cipher 26 */ 658/* Cipher 26 */
@@ -792,15 +660,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
792 1, 660 1,
793 SSL3_TXT_KRB5_DES_40_CBC_SHA, 661 SSL3_TXT_KRB5_DES_40_CBC_SHA,
794 SSL3_CK_KRB5_DES_40_CBC_SHA, 662 SSL3_CK_KRB5_DES_40_CBC_SHA,
795 SSL_kKRB5, 663 SSL_kKRB5|SSL_aKRB5| SSL_DES|SSL_SHA1 |SSL_SSLV3,
796 SSL_aKRB5,
797 SSL_DES,
798 SSL_SHA1,
799 SSL_SSLV3,
800 SSL_EXPORT|SSL_EXP40, 664 SSL_EXPORT|SSL_EXP40,
801 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 665 0,
802 40, 666 40,
803 56, 667 56,
668 SSL_ALL_CIPHERS,
669 SSL_ALL_STRENGTHS,
804 }, 670 },
805 671
806/* Cipher 27 */ 672/* Cipher 27 */
@@ -808,15 +674,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
808 1, 674 1,
809 SSL3_TXT_KRB5_RC2_40_CBC_SHA, 675 SSL3_TXT_KRB5_RC2_40_CBC_SHA,
810 SSL3_CK_KRB5_RC2_40_CBC_SHA, 676 SSL3_CK_KRB5_RC2_40_CBC_SHA,
811 SSL_kKRB5, 677 SSL_kKRB5|SSL_aKRB5| SSL_RC2|SSL_SHA1 |SSL_SSLV3,
812 SSL_aKRB5,
813 SSL_RC2,
814 SSL_SHA1,
815 SSL_SSLV3,
816 SSL_EXPORT|SSL_EXP40, 678 SSL_EXPORT|SSL_EXP40,
817 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 679 0,
818 40, 680 40,
819 128, 681 128,
682 SSL_ALL_CIPHERS,
683 SSL_ALL_STRENGTHS,
820 }, 684 },
821 685
822/* Cipher 28 */ 686/* Cipher 28 */
@@ -824,15 +688,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
824 1, 688 1,
825 SSL3_TXT_KRB5_RC4_40_SHA, 689 SSL3_TXT_KRB5_RC4_40_SHA,
826 SSL3_CK_KRB5_RC4_40_SHA, 690 SSL3_CK_KRB5_RC4_40_SHA,
827 SSL_kKRB5, 691 SSL_kKRB5|SSL_aKRB5| SSL_RC4|SSL_SHA1 |SSL_SSLV3,
828 SSL_aKRB5,
829 SSL_RC4,
830 SSL_SHA1,
831 SSL_SSLV3,
832 SSL_EXPORT|SSL_EXP40, 692 SSL_EXPORT|SSL_EXP40,
833 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 693 0,
834 40, 694 40,
835 128, 695 128,
696 SSL_ALL_CIPHERS,
697 SSL_ALL_STRENGTHS,
836 }, 698 },
837 699
838/* Cipher 29 */ 700/* Cipher 29 */
@@ -840,15 +702,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
840 1, 702 1,
841 SSL3_TXT_KRB5_DES_40_CBC_MD5, 703 SSL3_TXT_KRB5_DES_40_CBC_MD5,
842 SSL3_CK_KRB5_DES_40_CBC_MD5, 704 SSL3_CK_KRB5_DES_40_CBC_MD5,
843 SSL_kKRB5, 705 SSL_kKRB5|SSL_aKRB5| SSL_DES|SSL_MD5 |SSL_SSLV3,
844 SSL_aKRB5,
845 SSL_DES,
846 SSL_MD5,
847 SSL_SSLV3,
848 SSL_EXPORT|SSL_EXP40, 706 SSL_EXPORT|SSL_EXP40,
849 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 707 0,
850 40, 708 40,
851 56, 709 56,
710 SSL_ALL_CIPHERS,
711 SSL_ALL_STRENGTHS,
852 }, 712 },
853 713
854/* Cipher 2A */ 714/* Cipher 2A */
@@ -856,15 +716,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
856 1, 716 1,
857 SSL3_TXT_KRB5_RC2_40_CBC_MD5, 717 SSL3_TXT_KRB5_RC2_40_CBC_MD5,
858 SSL3_CK_KRB5_RC2_40_CBC_MD5, 718 SSL3_CK_KRB5_RC2_40_CBC_MD5,
859 SSL_kKRB5, 719 SSL_kKRB5|SSL_aKRB5| SSL_RC2|SSL_MD5 |SSL_SSLV3,
860 SSL_aKRB5,
861 SSL_RC2,
862 SSL_MD5,
863 SSL_SSLV3,
864 SSL_EXPORT|SSL_EXP40, 720 SSL_EXPORT|SSL_EXP40,
865 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 721 0,
866 40, 722 40,
867 128, 723 128,
724 SSL_ALL_CIPHERS,
725 SSL_ALL_STRENGTHS,
868 }, 726 },
869 727
870/* Cipher 2B */ 728/* Cipher 2B */
@@ -872,15 +730,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
872 1, 730 1,
873 SSL3_TXT_KRB5_RC4_40_MD5, 731 SSL3_TXT_KRB5_RC4_40_MD5,
874 SSL3_CK_KRB5_RC4_40_MD5, 732 SSL3_CK_KRB5_RC4_40_MD5,
875 SSL_kKRB5, 733 SSL_kKRB5|SSL_aKRB5| SSL_RC4|SSL_MD5 |SSL_SSLV3,
876 SSL_aKRB5,
877 SSL_RC4,
878 SSL_MD5,
879 SSL_SSLV3,
880 SSL_EXPORT|SSL_EXP40, 734 SSL_EXPORT|SSL_EXP40,
881 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 735 0,
882 40, 736 40,
883 128, 737 128,
738 SSL_ALL_CIPHERS,
739 SSL_ALL_STRENGTHS,
884 }, 740 },
885#endif /* OPENSSL_NO_KRB5 */ 741#endif /* OPENSSL_NO_KRB5 */
886 742
@@ -890,90 +746,78 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
890 1, 746 1,
891 TLS1_TXT_RSA_WITH_AES_128_SHA, 747 TLS1_TXT_RSA_WITH_AES_128_SHA,
892 TLS1_CK_RSA_WITH_AES_128_SHA, 748 TLS1_CK_RSA_WITH_AES_128_SHA,
893 SSL_kRSA, 749 SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
894 SSL_aRSA,
895 SSL_AES128,
896 SSL_SHA1,
897 SSL_TLSV1,
898 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 750 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
899 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 751 0,
900 128, 752 128,
901 128, 753 128,
754 SSL_ALL_CIPHERS,
755 SSL_ALL_STRENGTHS,
902 }, 756 },
903/* Cipher 30 */ 757/* Cipher 30 */
904 { 758 {
905 0, 759 0,
906 TLS1_TXT_DH_DSS_WITH_AES_128_SHA, 760 TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
907 TLS1_CK_DH_DSS_WITH_AES_128_SHA, 761 TLS1_CK_DH_DSS_WITH_AES_128_SHA,
908 SSL_kDHd, 762 SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
909 SSL_aDH,
910 SSL_AES128,
911 SSL_SHA1,
912 SSL_TLSV1,
913 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 763 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
914 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 764 0,
915 128, 765 128,
916 128, 766 128,
767 SSL_ALL_CIPHERS,
768 SSL_ALL_STRENGTHS,
917 }, 769 },
918/* Cipher 31 */ 770/* Cipher 31 */
919 { 771 {
920 0, 772 0,
921 TLS1_TXT_DH_RSA_WITH_AES_128_SHA, 773 TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
922 TLS1_CK_DH_RSA_WITH_AES_128_SHA, 774 TLS1_CK_DH_RSA_WITH_AES_128_SHA,
923 SSL_kDHr, 775 SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
924 SSL_aDH,
925 SSL_AES128,
926 SSL_SHA1,
927 SSL_TLSV1,
928 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 776 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
929 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 777 0,
930 128, 778 128,
931 128, 779 128,
780 SSL_ALL_CIPHERS,
781 SSL_ALL_STRENGTHS,
932 }, 782 },
933/* Cipher 32 */ 783/* Cipher 32 */
934 { 784 {
935 1, 785 1,
936 TLS1_TXT_DHE_DSS_WITH_AES_128_SHA, 786 TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,
937 TLS1_CK_DHE_DSS_WITH_AES_128_SHA, 787 TLS1_CK_DHE_DSS_WITH_AES_128_SHA,
938 SSL_kEDH, 788 SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
939 SSL_aDSS,
940 SSL_AES128,
941 SSL_SHA1,
942 SSL_TLSV1,
943 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 789 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
944 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 790 0,
945 128, 791 128,
946 128, 792 128,
793 SSL_ALL_CIPHERS,
794 SSL_ALL_STRENGTHS,
947 }, 795 },
948/* Cipher 33 */ 796/* Cipher 33 */
949 { 797 {
950 1, 798 1,
951 TLS1_TXT_DHE_RSA_WITH_AES_128_SHA, 799 TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,
952 TLS1_CK_DHE_RSA_WITH_AES_128_SHA, 800 TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
953 SSL_kEDH, 801 SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
954 SSL_aRSA,
955 SSL_AES128,
956 SSL_SHA1,
957 SSL_TLSV1,
958 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 802 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
959 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 803 0,
960 128, 804 128,
961 128, 805 128,
806 SSL_ALL_CIPHERS,
807 SSL_ALL_STRENGTHS,
962 }, 808 },
963/* Cipher 34 */ 809/* Cipher 34 */
964 { 810 {
965 1, 811 1,
966 TLS1_TXT_ADH_WITH_AES_128_SHA, 812 TLS1_TXT_ADH_WITH_AES_128_SHA,
967 TLS1_CK_ADH_WITH_AES_128_SHA, 813 TLS1_CK_ADH_WITH_AES_128_SHA,
968 SSL_kEDH, 814 SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
969 SSL_aNULL,
970 SSL_AES128,
971 SSL_SHA1,
972 SSL_TLSV1,
973 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 815 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
974 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 816 0,
975 128, 817 128,
976 128, 818 128,
819 SSL_ALL_CIPHERS,
820 SSL_ALL_STRENGTHS,
977 }, 821 },
978 822
979/* Cipher 35 */ 823/* Cipher 35 */
@@ -981,94 +825,78 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
981 1, 825 1,
982 TLS1_TXT_RSA_WITH_AES_256_SHA, 826 TLS1_TXT_RSA_WITH_AES_256_SHA,
983 TLS1_CK_RSA_WITH_AES_256_SHA, 827 TLS1_CK_RSA_WITH_AES_256_SHA,
984 SSL_kRSA, 828 SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
985 SSL_aRSA,
986 SSL_AES256,
987 SSL_SHA1,
988 SSL_TLSV1,
989 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 829 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
990 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 830 0,
991 256, 831 256,
992 256, 832 256,
833 SSL_ALL_CIPHERS,
834 SSL_ALL_STRENGTHS,
993 }, 835 },
994/* Cipher 36 */ 836/* Cipher 36 */
995 { 837 {
996 0, 838 0,
997 TLS1_TXT_DH_DSS_WITH_AES_256_SHA, 839 TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
998 TLS1_CK_DH_DSS_WITH_AES_256_SHA, 840 TLS1_CK_DH_DSS_WITH_AES_256_SHA,
999 SSL_kDHd, 841 SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
1000 SSL_aDH,
1001 SSL_AES256,
1002 SSL_SHA1,
1003 SSL_TLSV1,
1004 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 842 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1005 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 843 0,
1006 256, 844 256,
1007 256, 845 256,
846 SSL_ALL_CIPHERS,
847 SSL_ALL_STRENGTHS,
1008 }, 848 },
1009
1010/* Cipher 37 */ 849/* Cipher 37 */
1011 { 850 {
1012 0, /* not implemented (non-ephemeral DH) */ 851 0,
1013 TLS1_TXT_DH_RSA_WITH_AES_256_SHA, 852 TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
1014 TLS1_CK_DH_RSA_WITH_AES_256_SHA, 853 TLS1_CK_DH_RSA_WITH_AES_256_SHA,
1015 SSL_kDHr, 854 SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
1016 SSL_aDH,
1017 SSL_AES256,
1018 SSL_SHA1,
1019 SSL_TLSV1,
1020 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 855 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1021 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 856 0,
1022 256, 857 256,
1023 256, 858 256,
859 SSL_ALL_CIPHERS,
860 SSL_ALL_STRENGTHS,
1024 }, 861 },
1025
1026/* Cipher 38 */ 862/* Cipher 38 */
1027 { 863 {
1028 1, 864 1,
1029 TLS1_TXT_DHE_DSS_WITH_AES_256_SHA, 865 TLS1_TXT_DHE_DSS_WITH_AES_256_SHA,
1030 TLS1_CK_DHE_DSS_WITH_AES_256_SHA, 866 TLS1_CK_DHE_DSS_WITH_AES_256_SHA,
1031 SSL_kEDH, 867 SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
1032 SSL_aDSS,
1033 SSL_AES256,
1034 SSL_SHA1,
1035 SSL_TLSV1,
1036 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 868 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1037 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 869 0,
1038 256, 870 256,
1039 256, 871 256,
872 SSL_ALL_CIPHERS,
873 SSL_ALL_STRENGTHS,
1040 }, 874 },
1041
1042/* Cipher 39 */ 875/* Cipher 39 */
1043 { 876 {
1044 1, 877 1,
1045 TLS1_TXT_DHE_RSA_WITH_AES_256_SHA, 878 TLS1_TXT_DHE_RSA_WITH_AES_256_SHA,
1046 TLS1_CK_DHE_RSA_WITH_AES_256_SHA, 879 TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
1047 SSL_kEDH, 880 SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1048 SSL_aRSA,
1049 SSL_AES256,
1050 SSL_SHA1,
1051 SSL_TLSV1,
1052 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 881 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1053 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 882 0,
1054 256, 883 256,
1055 256, 884 256,
885 SSL_ALL_CIPHERS,
886 SSL_ALL_STRENGTHS,
1056 }, 887 },
1057
1058 /* Cipher 3A */ 888 /* Cipher 3A */
1059 { 889 {
1060 1, 890 1,
1061 TLS1_TXT_ADH_WITH_AES_256_SHA, 891 TLS1_TXT_ADH_WITH_AES_256_SHA,
1062 TLS1_CK_ADH_WITH_AES_256_SHA, 892 TLS1_CK_ADH_WITH_AES_256_SHA,
1063 SSL_kEDH, 893 SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
1064 SSL_aNULL,
1065 SSL_AES256,
1066 SSL_SHA1,
1067 SSL_TLSV1,
1068 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS, 894 SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1069 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 895 0,
1070 256, 896 256,
1071 256, 897 256,
898 SSL_ALL_CIPHERS,
899 SSL_ALL_STRENGTHS,
1072 }, 900 },
1073 901
1074#ifndef OPENSSL_NO_CAMELLIA 902#ifndef OPENSSL_NO_CAMELLIA
@@ -1079,95 +907,78 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1079 1, 907 1,
1080 TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA, 908 TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA,
1081 TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA, 909 TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA,
1082 SSL_kRSA, 910 SSL_kRSA|SSL_aRSA|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1083 SSL_aRSA,
1084 SSL_CAMELLIA128,
1085 SSL_SHA1,
1086 SSL_TLSV1,
1087 SSL_NOT_EXP|SSL_HIGH, 911 SSL_NOT_EXP|SSL_HIGH,
1088 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 912 0,
1089 128, 913 128,
1090 128, 914 128,
915 SSL_ALL_CIPHERS,
916 SSL_ALL_STRENGTHS
1091 }, 917 },
1092
1093 /* Cipher 42 */ 918 /* Cipher 42 */
1094 { 919 {
1095 0, /* not implemented (non-ephemeral DH) */ 920 0, /* not implemented (non-ephemeral DH) */
1096 TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA, 921 TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
1097 TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA, 922 TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
1098 SSL_kDHd, 923 SSL_kDHd|SSL_aDH|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1099 SSL_aDH,
1100 SSL_CAMELLIA128,
1101 SSL_SHA1,
1102 SSL_TLSV1,
1103 SSL_NOT_EXP|SSL_HIGH, 924 SSL_NOT_EXP|SSL_HIGH,
1104 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 925 0,
1105 128, 926 128,
1106 128, 927 128,
928 SSL_ALL_CIPHERS,
929 SSL_ALL_STRENGTHS
1107 }, 930 },
1108
1109 /* Cipher 43 */ 931 /* Cipher 43 */
1110 { 932 {
1111 0, /* not implemented (non-ephemeral DH) */ 933 0, /* not implemented (non-ephemeral DH) */
1112 TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA, 934 TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
1113 TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA, 935 TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
1114 SSL_kDHr, 936 SSL_kDHr|SSL_aDH|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1115 SSL_aDH,
1116 SSL_CAMELLIA128,
1117 SSL_SHA1,
1118 SSL_TLSV1,
1119 SSL_NOT_EXP|SSL_HIGH, 937 SSL_NOT_EXP|SSL_HIGH,
1120 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 938 0,
1121 128, 939 128,
1122 128, 940 128,
941 SSL_ALL_CIPHERS,
942 SSL_ALL_STRENGTHS
1123 }, 943 },
1124
1125 /* Cipher 44 */ 944 /* Cipher 44 */
1126 { 945 {
1127 1, 946 1,
1128 TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA, 947 TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
1129 TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA, 948 TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
1130 SSL_kEDH, 949 SSL_kEDH|SSL_aDSS|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1131 SSL_aDSS,
1132 SSL_CAMELLIA128,
1133 SSL_SHA1,
1134 SSL_TLSV1,
1135 SSL_NOT_EXP|SSL_HIGH, 950 SSL_NOT_EXP|SSL_HIGH,
1136 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 951 0,
1137 128, 952 128,
1138 128, 953 128,
954 SSL_ALL_CIPHERS,
955 SSL_ALL_STRENGTHS
1139 }, 956 },
1140
1141 /* Cipher 45 */ 957 /* Cipher 45 */
1142 { 958 {
1143 1, 959 1,
1144 TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, 960 TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
1145 TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, 961 TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
1146 SSL_kEDH, 962 SSL_kEDH|SSL_aRSA|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1147 SSL_aRSA,
1148 SSL_CAMELLIA128,
1149 SSL_SHA1,
1150 SSL_TLSV1,
1151 SSL_NOT_EXP|SSL_HIGH, 963 SSL_NOT_EXP|SSL_HIGH,
1152 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 964 0,
1153 128, 965 128,
1154 128, 966 128,
967 SSL_ALL_CIPHERS,
968 SSL_ALL_STRENGTHS
1155 }, 969 },
1156
1157 /* Cipher 46 */ 970 /* Cipher 46 */
1158 { 971 {
1159 1, 972 1,
1160 TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA, 973 TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA,
1161 TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA, 974 TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA,
1162 SSL_kEDH, 975 SSL_kEDH|SSL_aNULL|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1163 SSL_aNULL,
1164 SSL_CAMELLIA128,
1165 SSL_SHA1,
1166 SSL_TLSV1,
1167 SSL_NOT_EXP|SSL_HIGH, 976 SSL_NOT_EXP|SSL_HIGH,
1168 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 977 0,
1169 128, 978 128,
1170 128, 979 128,
980 SSL_ALL_CIPHERS,
981 SSL_ALL_STRENGTHS
1171 }, 982 },
1172#endif /* OPENSSL_NO_CAMELLIA */ 983#endif /* OPENSSL_NO_CAMELLIA */
1173 984
@@ -1175,174 +986,98 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1175 /* New TLS Export CipherSuites from expired ID */ 986 /* New TLS Export CipherSuites from expired ID */
1176#if 0 987#if 0
1177 /* Cipher 60 */ 988 /* Cipher 60 */
1178 { 989 {
1179 1, 990 1,
1180 TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5, 991 TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5,
1181 TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5, 992 TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5,
1182 SSL_kRSA, 993 SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_TLSV1,
1183 SSL_aRSA, 994 SSL_EXPORT|SSL_EXP56,
1184 SSL_RC4, 995 0,
1185 SSL_MD5, 996 56,
1186 SSL_TLSV1, 997 128,
1187 SSL_EXPORT|SSL_EXP56, 998 SSL_ALL_CIPHERS,
1188 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 999 SSL_ALL_STRENGTHS,
1189 56, 1000 },
1190 128,
1191 },
1192
1193 /* Cipher 61 */ 1001 /* Cipher 61 */
1194 { 1002 {
1195 1, 1003 1,
1196 TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5, 1004 TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
1197 TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5, 1005 TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
1198 SSL_kRSA, 1006 SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_TLSV1,
1199 SSL_aRSA, 1007 SSL_EXPORT|SSL_EXP56,
1200 SSL_RC2, 1008 0,
1201 SSL_MD5, 1009 56,
1202 SSL_TLSV1, 1010 128,
1203 SSL_EXPORT|SSL_EXP56, 1011 SSL_ALL_CIPHERS,
1204 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1012 SSL_ALL_STRENGTHS,
1205 56, 1013 },
1206 128,
1207 },
1208#endif 1014#endif
1209
1210 /* Cipher 62 */ 1015 /* Cipher 62 */
1211 { 1016 {
1212 1, 1017 1,
1213 TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA, 1018 TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
1214 TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA, 1019 TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
1215 SSL_kRSA, 1020 SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA|SSL_TLSV1,
1216 SSL_aRSA, 1021 SSL_EXPORT|SSL_EXP56,
1217 SSL_DES, 1022 0,
1218 SSL_SHA1, 1023 56,
1219 SSL_TLSV1, 1024 56,
1220 SSL_EXPORT|SSL_EXP56, 1025 SSL_ALL_CIPHERS,
1221 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1026 SSL_ALL_STRENGTHS,
1222 56, 1027 },
1223 56,
1224 },
1225
1226 /* Cipher 63 */ 1028 /* Cipher 63 */
1227 { 1029 {
1228 1, 1030 1,
1229 TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA, 1031 TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
1230 TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA, 1032 TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
1231 SSL_kEDH, 1033 SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA|SSL_TLSV1,
1232 SSL_aDSS, 1034 SSL_EXPORT|SSL_EXP56,
1233 SSL_DES, 1035 0,
1234 SSL_SHA1, 1036 56,
1235 SSL_TLSV1, 1037 56,
1236 SSL_EXPORT|SSL_EXP56, 1038 SSL_ALL_CIPHERS,
1237 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1039 SSL_ALL_STRENGTHS,
1238 56, 1040 },
1239 56,
1240 },
1241
1242 /* Cipher 64 */ 1041 /* Cipher 64 */
1243 { 1042 {
1244 1, 1043 1,
1245 TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA, 1044 TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
1246 TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA, 1045 TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA,
1247 SSL_kRSA, 1046 SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
1248 SSL_aRSA, 1047 SSL_EXPORT|SSL_EXP56,
1249 SSL_RC4, 1048 0,
1250 SSL_SHA1, 1049 56,
1251 SSL_TLSV1, 1050 128,
1252 SSL_EXPORT|SSL_EXP56, 1051 SSL_ALL_CIPHERS,
1253 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1052 SSL_ALL_STRENGTHS,
1254 56, 1053 },
1255 128,
1256 },
1257
1258 /* Cipher 65 */ 1054 /* Cipher 65 */
1259 { 1055 {
1260 1, 1056 1,
1261 TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA, 1057 TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
1262 TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA, 1058 TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
1263 SSL_kEDH, 1059 SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
1264 SSL_aDSS, 1060 SSL_EXPORT|SSL_EXP56,
1265 SSL_RC4, 1061 0,
1266 SSL_SHA1, 1062 56,
1267 SSL_TLSV1, 1063 128,
1268 SSL_EXPORT|SSL_EXP56, 1064 SSL_ALL_CIPHERS,
1269 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1065 SSL_ALL_STRENGTHS,
1270 56, 1066 },
1271 128,
1272 },
1273
1274 /* Cipher 66 */ 1067 /* Cipher 66 */
1275 { 1068 {
1276 1, 1069 1,
1277 TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA, 1070 TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
1278 TLS1_CK_DHE_DSS_WITH_RC4_128_SHA, 1071 TLS1_CK_DHE_DSS_WITH_RC4_128_SHA,
1279 SSL_kEDH, 1072 SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
1280 SSL_aDSS, 1073 SSL_NOT_EXP|SSL_MEDIUM,
1281 SSL_RC4, 1074 0,
1282 SSL_SHA1, 1075 128,
1283 SSL_TLSV1, 1076 128,
1284 SSL_NOT_EXP|SSL_MEDIUM, 1077 SSL_ALL_CIPHERS,
1285 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1078 SSL_ALL_STRENGTHS
1286 128, 1079 },
1287 128,
1288 },
1289#endif 1080#endif
1290 {
1291 1,
1292 "GOST94-GOST89-GOST89",
1293 0x3000080,
1294 SSL_kGOST,
1295 SSL_aGOST94,
1296 SSL_eGOST2814789CNT,
1297 SSL_GOST89MAC,
1298 SSL_TLSV1,
1299 SSL_NOT_EXP|SSL_HIGH,
1300 SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|TLS1_STREAM_MAC,
1301 256,
1302 256
1303 },
1304 {
1305 1,
1306 "GOST2001-GOST89-GOST89",
1307 0x3000081,
1308 SSL_kGOST,
1309 SSL_aGOST01,
1310 SSL_eGOST2814789CNT,
1311 SSL_GOST89MAC,
1312 SSL_TLSV1,
1313 SSL_NOT_EXP|SSL_HIGH,
1314 SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|TLS1_STREAM_MAC,
1315 256,
1316 256
1317 },
1318 {
1319 1,
1320 "GOST94-NULL-GOST94",
1321 0x3000082,
1322 SSL_kGOST,
1323 SSL_aGOST94,
1324 SSL_eNULL,
1325 SSL_GOST94,
1326 SSL_TLSV1,
1327 SSL_NOT_EXP|SSL_STRONG_NONE,
1328 SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
1329 0,
1330 0
1331 },
1332 {
1333 1,
1334 "GOST2001-NULL-GOST94",
1335 0x3000083,
1336 SSL_kGOST,
1337 SSL_aGOST01,
1338 SSL_eNULL,
1339 SSL_GOST94,
1340 SSL_TLSV1,
1341 SSL_NOT_EXP|SSL_STRONG_NONE,
1342 SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
1343 0,
1344 0
1345 },
1346 1081
1347#ifndef OPENSSL_NO_CAMELLIA 1082#ifndef OPENSSL_NO_CAMELLIA
1348 /* Camellia ciphersuites from RFC4132 (256-bit portion) */ 1083 /* Camellia ciphersuites from RFC4132 (256-bit portion) */
@@ -1352,163 +1087,81 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1352 1, 1087 1,
1353 TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA, 1088 TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA,
1354 TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA, 1089 TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA,
1355 SSL_kRSA, 1090 SSL_kRSA|SSL_aRSA|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1356 SSL_aRSA,
1357 SSL_CAMELLIA256,
1358 SSL_SHA1,
1359 SSL_TLSV1,
1360 SSL_NOT_EXP|SSL_HIGH, 1091 SSL_NOT_EXP|SSL_HIGH,
1361 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1092 0,
1362 256, 1093 256,
1363 256, 1094 256,
1095 SSL_ALL_CIPHERS,
1096 SSL_ALL_STRENGTHS
1364 }, 1097 },
1365 /* Cipher 85 */ 1098 /* Cipher 85 */
1366 { 1099 {
1367 0, /* not implemented (non-ephemeral DH) */ 1100 0, /* not implemented (non-ephemeral DH) */
1368 TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA, 1101 TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
1369 TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA, 1102 TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
1370 SSL_kDHd, 1103 SSL_kDHd|SSL_aDH|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1371 SSL_aDH,
1372 SSL_CAMELLIA256,
1373 SSL_SHA1,
1374 SSL_TLSV1,
1375 SSL_NOT_EXP|SSL_HIGH, 1104 SSL_NOT_EXP|SSL_HIGH,
1376 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1105 0,
1377 256, 1106 256,
1378 256, 1107 256,
1108 SSL_ALL_CIPHERS,
1109 SSL_ALL_STRENGTHS
1379 }, 1110 },
1380
1381 /* Cipher 86 */ 1111 /* Cipher 86 */
1382 { 1112 {
1383 0, /* not implemented (non-ephemeral DH) */ 1113 0, /* not implemented (non-ephemeral DH) */
1384 TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA, 1114 TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
1385 TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA, 1115 TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
1386 SSL_kDHr, 1116 SSL_kDHr|SSL_aDH|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1387 SSL_aDH,
1388 SSL_CAMELLIA256,
1389 SSL_SHA1,
1390 SSL_TLSV1,
1391 SSL_NOT_EXP|SSL_HIGH, 1117 SSL_NOT_EXP|SSL_HIGH,
1392 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1118 0,
1393 256, 1119 256,
1394 256, 1120 256,
1121 SSL_ALL_CIPHERS,
1122 SSL_ALL_STRENGTHS
1395 }, 1123 },
1396
1397 /* Cipher 87 */ 1124 /* Cipher 87 */
1398 { 1125 {
1399 1, 1126 1,
1400 TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, 1127 TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
1401 TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, 1128 TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
1402 SSL_kEDH, 1129 SSL_kEDH|SSL_aDSS|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1403 SSL_aDSS,
1404 SSL_CAMELLIA256,
1405 SSL_SHA1,
1406 SSL_TLSV1,
1407 SSL_NOT_EXP|SSL_HIGH, 1130 SSL_NOT_EXP|SSL_HIGH,
1408 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1131 0,
1409 256, 1132 256,
1410 256, 1133 256,
1134 SSL_ALL_CIPHERS,
1135 SSL_ALL_STRENGTHS
1411 }, 1136 },
1412
1413 /* Cipher 88 */ 1137 /* Cipher 88 */
1414 { 1138 {
1415 1, 1139 1,
1416 TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, 1140 TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
1417 TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, 1141 TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
1418 SSL_kEDH, 1142 SSL_kEDH|SSL_aRSA|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1419 SSL_aRSA,
1420 SSL_CAMELLIA256,
1421 SSL_SHA1,
1422 SSL_TLSV1,
1423 SSL_NOT_EXP|SSL_HIGH, 1143 SSL_NOT_EXP|SSL_HIGH,
1424 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1144 0,
1425 256, 1145 256,
1426 256, 1146 256,
1147 SSL_ALL_CIPHERS,
1148 SSL_ALL_STRENGTHS
1427 }, 1149 },
1428
1429 /* Cipher 89 */ 1150 /* Cipher 89 */
1430 { 1151 {
1431 1, 1152 1,
1432 TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA, 1153 TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA,
1433 TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA, 1154 TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA,
1434 SSL_kEDH, 1155 SSL_kEDH|SSL_aNULL|SSL_CAMELLIA|SSL_SHA|SSL_TLSV1,
1435 SSL_aNULL,
1436 SSL_CAMELLIA256,
1437 SSL_SHA1,
1438 SSL_TLSV1,
1439 SSL_NOT_EXP|SSL_HIGH, 1156 SSL_NOT_EXP|SSL_HIGH,
1440 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1157 0,
1441 256, 1158 256,
1442 256, 1159 256,
1160 SSL_ALL_CIPHERS,
1161 SSL_ALL_STRENGTHS
1443 }, 1162 },
1444#endif /* OPENSSL_NO_CAMELLIA */ 1163#endif /* OPENSSL_NO_CAMELLIA */
1445 1164
1446#ifndef OPENSSL_NO_PSK
1447 /* Cipher 8A */
1448 {
1449 1,
1450 TLS1_TXT_PSK_WITH_RC4_128_SHA,
1451 TLS1_CK_PSK_WITH_RC4_128_SHA,
1452 SSL_kPSK,
1453 SSL_aPSK,
1454 SSL_RC4,
1455 SSL_SHA1,
1456 SSL_TLSV1,
1457 SSL_NOT_EXP|SSL_MEDIUM,
1458 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1459 128,
1460 128,
1461 },
1462
1463 /* Cipher 8B */
1464 {
1465 1,
1466 TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA,
1467 TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA,
1468 SSL_kPSK,
1469 SSL_aPSK,
1470 SSL_3DES,
1471 SSL_SHA1,
1472 SSL_TLSV1,
1473 SSL_NOT_EXP|SSL_HIGH,
1474 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1475 168,
1476 168,
1477 },
1478
1479 /* Cipher 8C */
1480 {
1481 1,
1482 TLS1_TXT_PSK_WITH_AES_128_CBC_SHA,
1483 TLS1_CK_PSK_WITH_AES_128_CBC_SHA,
1484 SSL_kPSK,
1485 SSL_aPSK,
1486 SSL_AES128,
1487 SSL_SHA1,
1488 SSL_TLSV1,
1489 SSL_NOT_EXP|SSL_HIGH,
1490 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1491 128,
1492 128,
1493 },
1494
1495 /* Cipher 8D */
1496 {
1497 1,
1498 TLS1_TXT_PSK_WITH_AES_256_CBC_SHA,
1499 TLS1_CK_PSK_WITH_AES_256_CBC_SHA,
1500 SSL_kPSK,
1501 SSL_aPSK,
1502 SSL_AES256,
1503 SSL_SHA1,
1504 SSL_TLSV1,
1505 SSL_NOT_EXP|SSL_HIGH,
1506 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1507 256,
1508 256,
1509 },
1510#endif /* OPENSSL_NO_PSK */
1511
1512#ifndef OPENSSL_NO_SEED 1165#ifndef OPENSSL_NO_SEED
1513 /* SEED ciphersuites from RFC4162 */ 1166 /* SEED ciphersuites from RFC4162 */
1514 1167
@@ -1517,15 +1170,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1517 1, 1170 1,
1518 TLS1_TXT_RSA_WITH_SEED_SHA, 1171 TLS1_TXT_RSA_WITH_SEED_SHA,
1519 TLS1_CK_RSA_WITH_SEED_SHA, 1172 TLS1_CK_RSA_WITH_SEED_SHA,
1520 SSL_kRSA, 1173 SSL_kRSA|SSL_aRSA|SSL_SEED|SSL_SHA1|SSL_TLSV1,
1521 SSL_aRSA,
1522 SSL_SEED,
1523 SSL_SHA1,
1524 SSL_TLSV1,
1525 SSL_NOT_EXP|SSL_MEDIUM, 1174 SSL_NOT_EXP|SSL_MEDIUM,
1526 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1175 0,
1527 128, 1176 128,
1528 128, 1177 128,
1178 SSL_ALL_CIPHERS,
1179 SSL_ALL_STRENGTHS,
1529 }, 1180 },
1530 1181
1531 /* Cipher 97 */ 1182 /* Cipher 97 */
@@ -1533,15 +1184,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1533 0, /* not implemented (non-ephemeral DH) */ 1184 0, /* not implemented (non-ephemeral DH) */
1534 TLS1_TXT_DH_DSS_WITH_SEED_SHA, 1185 TLS1_TXT_DH_DSS_WITH_SEED_SHA,
1535 TLS1_CK_DH_DSS_WITH_SEED_SHA, 1186 TLS1_CK_DH_DSS_WITH_SEED_SHA,
1536 SSL_kDHd, 1187 SSL_kDHd|SSL_aDH|SSL_SEED|SSL_SHA1|SSL_TLSV1,
1537 SSL_aDH,
1538 SSL_SEED,
1539 SSL_SHA1,
1540 SSL_TLSV1,
1541 SSL_NOT_EXP|SSL_MEDIUM, 1188 SSL_NOT_EXP|SSL_MEDIUM,
1542 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1189 0,
1543 128, 1190 128,
1544 128, 1191 128,
1192 SSL_ALL_CIPHERS,
1193 SSL_ALL_STRENGTHS,
1545 }, 1194 },
1546 1195
1547 /* Cipher 98 */ 1196 /* Cipher 98 */
@@ -1549,15 +1198,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1549 0, /* not implemented (non-ephemeral DH) */ 1198 0, /* not implemented (non-ephemeral DH) */
1550 TLS1_TXT_DH_RSA_WITH_SEED_SHA, 1199 TLS1_TXT_DH_RSA_WITH_SEED_SHA,
1551 TLS1_CK_DH_RSA_WITH_SEED_SHA, 1200 TLS1_CK_DH_RSA_WITH_SEED_SHA,
1552 SSL_kDHr, 1201 SSL_kDHr|SSL_aDH|SSL_SEED|SSL_SHA1|SSL_TLSV1,
1553 SSL_aDH,
1554 SSL_SEED,
1555 SSL_SHA1,
1556 SSL_TLSV1,
1557 SSL_NOT_EXP|SSL_MEDIUM, 1202 SSL_NOT_EXP|SSL_MEDIUM,
1558 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1203 0,
1559 128, 1204 128,
1560 128, 1205 128,
1206 SSL_ALL_CIPHERS,
1207 SSL_ALL_STRENGTHS,
1561 }, 1208 },
1562 1209
1563 /* Cipher 99 */ 1210 /* Cipher 99 */
@@ -1565,15 +1212,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1565 1, 1212 1,
1566 TLS1_TXT_DHE_DSS_WITH_SEED_SHA, 1213 TLS1_TXT_DHE_DSS_WITH_SEED_SHA,
1567 TLS1_CK_DHE_DSS_WITH_SEED_SHA, 1214 TLS1_CK_DHE_DSS_WITH_SEED_SHA,
1568 SSL_kEDH, 1215 SSL_kEDH|SSL_aDSS|SSL_SEED|SSL_SHA1|SSL_TLSV1,
1569 SSL_aDSS,
1570 SSL_SEED,
1571 SSL_SHA1,
1572 SSL_TLSV1,
1573 SSL_NOT_EXP|SSL_MEDIUM, 1216 SSL_NOT_EXP|SSL_MEDIUM,
1574 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1217 0,
1575 128, 1218 128,
1576 128, 1219 128,
1220 SSL_ALL_CIPHERS,
1221 SSL_ALL_STRENGTHS,
1577 }, 1222 },
1578 1223
1579 /* Cipher 9A */ 1224 /* Cipher 9A */
@@ -1581,15 +1226,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1581 1, 1226 1,
1582 TLS1_TXT_DHE_RSA_WITH_SEED_SHA, 1227 TLS1_TXT_DHE_RSA_WITH_SEED_SHA,
1583 TLS1_CK_DHE_RSA_WITH_SEED_SHA, 1228 TLS1_CK_DHE_RSA_WITH_SEED_SHA,
1584 SSL_kEDH, 1229 SSL_kEDH|SSL_aRSA|SSL_SEED|SSL_SHA1|SSL_TLSV1,
1585 SSL_aRSA,
1586 SSL_SEED,
1587 SSL_SHA1,
1588 SSL_TLSV1,
1589 SSL_NOT_EXP|SSL_MEDIUM, 1230 SSL_NOT_EXP|SSL_MEDIUM,
1590 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1231 0,
1591 128, 1232 128,
1592 128, 1233 128,
1234 SSL_ALL_CIPHERS,
1235 SSL_ALL_STRENGTHS,
1593 }, 1236 },
1594 1237
1595 /* Cipher 9B */ 1238 /* Cipher 9B */
@@ -1597,487 +1240,376 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
1597 1, 1240 1,
1598 TLS1_TXT_ADH_WITH_SEED_SHA, 1241 TLS1_TXT_ADH_WITH_SEED_SHA,
1599 TLS1_CK_ADH_WITH_SEED_SHA, 1242 TLS1_CK_ADH_WITH_SEED_SHA,
1600 SSL_kEDH, 1243 SSL_kEDH|SSL_aNULL|SSL_SEED|SSL_SHA1|SSL_TLSV1,
1601 SSL_aNULL,
1602 SSL_SEED,
1603 SSL_SHA1,
1604 SSL_TLSV1,
1605 SSL_NOT_EXP|SSL_MEDIUM, 1244 SSL_NOT_EXP|SSL_MEDIUM,
1606 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1245 0,
1607 128, 1246 128,
1608 128, 1247 128,
1248 SSL_ALL_CIPHERS,
1249 SSL_ALL_STRENGTHS,
1609 }, 1250 },
1610 1251
1611#endif /* OPENSSL_NO_SEED */ 1252#endif /* OPENSSL_NO_SEED */
1612 1253
1613#ifndef OPENSSL_NO_ECDH 1254#ifndef OPENSSL_NO_ECDH
1614 /* Cipher C001 */ 1255 /* Cipher C001 */
1615 { 1256 {
1616 1, 1257 1,
1617 TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA, 1258 TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA,
1618 TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA, 1259 TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA,
1619 SSL_kECDHe, 1260 SSL_kECDH|SSL_aECDSA|SSL_eNULL|SSL_SHA|SSL_TLSV1,
1620 SSL_aECDH, 1261 SSL_NOT_EXP,
1621 SSL_eNULL, 1262 0,
1622 SSL_SHA1, 1263 0,
1623 SSL_TLSV1, 1264 0,
1624 SSL_NOT_EXP|SSL_STRONG_NONE, 1265 SSL_ALL_CIPHERS,
1625 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1266 SSL_ALL_STRENGTHS,
1626 0, 1267 },
1627 0,
1628 },
1629 1268
1630 /* Cipher C002 */ 1269 /* Cipher C002 */
1631 { 1270 {
1632 1, 1271 1,
1633 TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA, 1272 TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA,
1634 TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA, 1273 TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA,
1635 SSL_kECDHe, 1274 SSL_kECDH|SSL_aECDSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
1636 SSL_aECDH, 1275 SSL_NOT_EXP,
1637 SSL_RC4, 1276 0,
1638 SSL_SHA1, 1277 128,
1639 SSL_TLSV1, 1278 128,
1640 SSL_NOT_EXP|SSL_MEDIUM, 1279 SSL_ALL_CIPHERS,
1641 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1280 SSL_ALL_STRENGTHS,
1642 128, 1281 },
1643 128,
1644 },
1645 1282
1646 /* Cipher C003 */ 1283 /* Cipher C003 */
1647 { 1284 {
1648 1, 1285 1,
1649 TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA, 1286 TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA,
1650 TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA, 1287 TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA,
1651 SSL_kECDHe, 1288 SSL_kECDH|SSL_aECDSA|SSL_3DES|SSL_SHA|SSL_TLSV1,
1652 SSL_aECDH, 1289 SSL_NOT_EXP|SSL_HIGH,
1653 SSL_3DES, 1290 0,
1654 SSL_SHA1, 1291 168,
1655 SSL_TLSV1, 1292 168,
1656 SSL_NOT_EXP|SSL_HIGH, 1293 SSL_ALL_CIPHERS,
1657 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1294 SSL_ALL_STRENGTHS,
1658 168, 1295 },
1659 168,
1660 },
1661 1296
1662 /* Cipher C004 */ 1297 /* Cipher C004 */
1663 { 1298 {
1664 1, 1299 1,
1665 TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA, 1300 TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
1666 TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA, 1301 TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
1667 SSL_kECDHe, 1302 SSL_kECDH|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1668 SSL_aECDH, 1303 SSL_NOT_EXP|SSL_HIGH,
1669 SSL_AES128, 1304 0,
1670 SSL_SHA1, 1305 128,
1671 SSL_TLSV1, 1306 128,
1672 SSL_NOT_EXP|SSL_HIGH, 1307 SSL_ALL_CIPHERS,
1673 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1308 SSL_ALL_STRENGTHS,
1674 128, 1309 },
1675 128,
1676 },
1677 1310
1678 /* Cipher C005 */ 1311 /* Cipher C005 */
1679 { 1312 {
1680 1, 1313 1,
1681 TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA, 1314 TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
1682 TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA, 1315 TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
1683 SSL_kECDHe, 1316 SSL_kECDH|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1684 SSL_aECDH, 1317 SSL_NOT_EXP|SSL_HIGH,
1685 SSL_AES256, 1318 0,
1686 SSL_SHA1, 1319 256,
1687 SSL_TLSV1, 1320 256,
1688 SSL_NOT_EXP|SSL_HIGH, 1321 SSL_ALL_CIPHERS,
1689 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1322 SSL_ALL_STRENGTHS,
1690 256, 1323 },
1691 256,
1692 },
1693 1324
1694 /* Cipher C006 */ 1325 /* Cipher C006 */
1695 { 1326 {
1696 1, 1327 1,
1697 TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA, 1328 TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA,
1698 TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA, 1329 TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA,
1699 SSL_kEECDH, 1330 SSL_kECDHE|SSL_aECDSA|SSL_eNULL|SSL_SHA|SSL_TLSV1,
1700 SSL_aECDSA, 1331 SSL_NOT_EXP,
1701 SSL_eNULL, 1332 0,
1702 SSL_SHA1, 1333 0,
1703 SSL_TLSV1, 1334 0,
1704 SSL_NOT_EXP|SSL_STRONG_NONE, 1335 SSL_ALL_CIPHERS,
1705 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1336 SSL_ALL_STRENGTHS,
1706 0, 1337 },
1707 0,
1708 },
1709 1338
1710 /* Cipher C007 */ 1339 /* Cipher C007 */
1711 { 1340 {
1712 1, 1341 1,
1713 TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA, 1342 TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA,
1714 TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA, 1343 TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA,
1715 SSL_kEECDH, 1344 SSL_kECDHE|SSL_aECDSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
1716 SSL_aECDSA, 1345 SSL_NOT_EXP,
1717 SSL_RC4, 1346 0,
1718 SSL_SHA1, 1347 128,
1719 SSL_TLSV1, 1348 128,
1720 SSL_NOT_EXP|SSL_MEDIUM, 1349 SSL_ALL_CIPHERS,
1721 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1350 SSL_ALL_STRENGTHS,
1722 128, 1351 },
1723 128,
1724 },
1725 1352
1726 /* Cipher C008 */ 1353 /* Cipher C008 */
1727 { 1354 {
1728 1, 1355 1,
1729 TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA, 1356 TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
1730 TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA, 1357 TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
1731 SSL_kEECDH, 1358 SSL_kECDHE|SSL_aECDSA|SSL_3DES|SSL_SHA|SSL_TLSV1,
1732 SSL_aECDSA, 1359 SSL_NOT_EXP|SSL_HIGH,
1733 SSL_3DES, 1360 0,
1734 SSL_SHA1, 1361 168,
1735 SSL_TLSV1, 1362 168,
1736 SSL_NOT_EXP|SSL_HIGH, 1363 SSL_ALL_CIPHERS,
1737 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1364 SSL_ALL_STRENGTHS,
1738 168, 1365 },
1739 168,
1740 },
1741 1366
1742 /* Cipher C009 */ 1367 /* Cipher C009 */
1743 { 1368 {
1744 1, 1369 1,
1745 TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, 1370 TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
1746 TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, 1371 TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
1747 SSL_kEECDH, 1372 SSL_kECDHE|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1748 SSL_aECDSA, 1373 SSL_NOT_EXP|SSL_HIGH,
1749 SSL_AES128, 1374 0,
1750 SSL_SHA1, 1375 128,
1751 SSL_TLSV1, 1376 128,
1752 SSL_NOT_EXP|SSL_HIGH, 1377 SSL_ALL_CIPHERS,
1753 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1378 SSL_ALL_STRENGTHS,
1754 128, 1379 },
1755 128,
1756 },
1757 1380
1758 /* Cipher C00A */ 1381 /* Cipher C00A */
1759 { 1382 {
1760 1, 1383 1,
1761 TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 1384 TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
1762 TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 1385 TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
1763 SSL_kEECDH, 1386 SSL_kECDHE|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1764 SSL_aECDSA, 1387 SSL_NOT_EXP|SSL_HIGH,
1765 SSL_AES256, 1388 0,
1766 SSL_SHA1, 1389 256,
1767 SSL_TLSV1, 1390 256,
1768 SSL_NOT_EXP|SSL_HIGH, 1391 SSL_ALL_CIPHERS,
1769 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1392 SSL_ALL_STRENGTHS,
1770 256, 1393 },
1771 256,
1772 },
1773 1394
1774 /* Cipher C00B */ 1395 /* Cipher C00B */
1775 { 1396 {
1776 1, 1397 1,
1777 TLS1_TXT_ECDH_RSA_WITH_NULL_SHA, 1398 TLS1_TXT_ECDH_RSA_WITH_NULL_SHA,
1778 TLS1_CK_ECDH_RSA_WITH_NULL_SHA, 1399 TLS1_CK_ECDH_RSA_WITH_NULL_SHA,
1779 SSL_kECDHr, 1400 SSL_kECDH|SSL_aRSA|SSL_eNULL|SSL_SHA|SSL_TLSV1,
1780 SSL_aECDH, 1401 SSL_NOT_EXP,
1781 SSL_eNULL, 1402 0,
1782 SSL_SHA1, 1403 0,
1783 SSL_TLSV1, 1404 0,
1784 SSL_NOT_EXP|SSL_STRONG_NONE, 1405 SSL_ALL_CIPHERS,
1785 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1406 SSL_ALL_STRENGTHS,
1786 0, 1407 },
1787 0,
1788 },
1789 1408
1790 /* Cipher C00C */ 1409 /* Cipher C00C */
1791 { 1410 {
1792 1, 1411 1,
1793 TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA, 1412 TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA,
1794 TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA, 1413 TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA,
1795 SSL_kECDHr, 1414 SSL_kECDH|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
1796 SSL_aECDH, 1415 SSL_NOT_EXP,
1797 SSL_RC4, 1416 0,
1798 SSL_SHA1, 1417 128,
1799 SSL_TLSV1, 1418 128,
1800 SSL_NOT_EXP|SSL_MEDIUM, 1419 SSL_ALL_CIPHERS,
1801 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1420 SSL_ALL_STRENGTHS,
1802 128, 1421 },
1803 128,
1804 },
1805 1422
1806 /* Cipher C00D */ 1423 /* Cipher C00D */
1807 { 1424 {
1808 1, 1425 1,
1809 TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA, 1426 TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA,
1810 TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA, 1427 TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA,
1811 SSL_kECDHr, 1428 SSL_kECDH|SSL_aRSA|SSL_3DES|SSL_SHA|SSL_TLSV1,
1812 SSL_aECDH, 1429 SSL_NOT_EXP|SSL_HIGH,
1813 SSL_3DES, 1430 0,
1814 SSL_SHA1, 1431 168,
1815 SSL_TLSV1, 1432 168,
1816 SSL_NOT_EXP|SSL_HIGH, 1433 SSL_ALL_CIPHERS,
1817 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1434 SSL_ALL_STRENGTHS,
1818 168, 1435 },
1819 168,
1820 },
1821 1436
1822 /* Cipher C00E */ 1437 /* Cipher C00E */
1823 { 1438 {
1824 1, 1439 1,
1825 TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA, 1440 TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA,
1826 TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA, 1441 TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA,
1827 SSL_kECDHr, 1442 SSL_kECDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1828 SSL_aECDH, 1443 SSL_NOT_EXP|SSL_HIGH,
1829 SSL_AES128, 1444 0,
1830 SSL_SHA1, 1445 128,
1831 SSL_TLSV1, 1446 128,
1832 SSL_NOT_EXP|SSL_HIGH, 1447 SSL_ALL_CIPHERS,
1833 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1448 SSL_ALL_STRENGTHS,
1834 128, 1449 },
1835 128,
1836 },
1837 1450
1838 /* Cipher C00F */ 1451 /* Cipher C00F */
1839 { 1452 {
1840 1, 1453 1,
1841 TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA, 1454 TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA,
1842 TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA, 1455 TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA,
1843 SSL_kECDHr, 1456 SSL_kECDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1844 SSL_aECDH, 1457 SSL_NOT_EXP|SSL_HIGH,
1845 SSL_AES256, 1458 0,
1846 SSL_SHA1, 1459 256,
1847 SSL_TLSV1, 1460 256,
1848 SSL_NOT_EXP|SSL_HIGH, 1461 SSL_ALL_CIPHERS,
1849 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1462 SSL_ALL_STRENGTHS,
1850 256, 1463 },
1851 256,
1852 },
1853 1464
1854 /* Cipher C010 */ 1465 /* Cipher C010 */
1855 { 1466 {
1856 1, 1467 1,
1857 TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA, 1468 TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA,
1858 TLS1_CK_ECDHE_RSA_WITH_NULL_SHA, 1469 TLS1_CK_ECDHE_RSA_WITH_NULL_SHA,
1859 SSL_kEECDH, 1470 SSL_kECDHE|SSL_aRSA|SSL_eNULL|SSL_SHA|SSL_TLSV1,
1860 SSL_aRSA, 1471 SSL_NOT_EXP,
1861 SSL_eNULL, 1472 0,
1862 SSL_SHA1, 1473 0,
1863 SSL_TLSV1, 1474 0,
1864 SSL_NOT_EXP|SSL_STRONG_NONE, 1475 SSL_ALL_CIPHERS,
1865 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1476 SSL_ALL_STRENGTHS,
1866 0, 1477 },
1867 0,
1868 },
1869 1478
1870 /* Cipher C011 */ 1479 /* Cipher C011 */
1871 { 1480 {
1872 1, 1481 1,
1873 TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA, 1482 TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA,
1874 TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA, 1483 TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA,
1875 SSL_kEECDH, 1484 SSL_kECDHE|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
1876 SSL_aRSA, 1485 SSL_NOT_EXP,
1877 SSL_RC4, 1486 0,
1878 SSL_SHA1, 1487 128,
1879 SSL_TLSV1, 1488 128,
1880 SSL_NOT_EXP|SSL_MEDIUM, 1489 SSL_ALL_CIPHERS,
1881 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1490 SSL_ALL_STRENGTHS,
1882 128, 1491 },
1883 128,
1884 },
1885 1492
1886 /* Cipher C012 */ 1493 /* Cipher C012 */
1887 { 1494 {
1888 1, 1495 1,
1889 TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA, 1496 TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
1890 TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA, 1497 TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
1891 SSL_kEECDH, 1498 SSL_kECDHE|SSL_aRSA|SSL_3DES|SSL_SHA|SSL_TLSV1,
1892 SSL_aRSA, 1499 SSL_NOT_EXP|SSL_HIGH,
1893 SSL_3DES, 1500 0,
1894 SSL_SHA1, 1501 168,
1895 SSL_TLSV1, 1502 168,
1896 SSL_NOT_EXP|SSL_HIGH, 1503 SSL_ALL_CIPHERS,
1897 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1504 SSL_ALL_STRENGTHS,
1898 168, 1505 },
1899 168,
1900 },
1901 1506
1902 /* Cipher C013 */ 1507 /* Cipher C013 */
1903 { 1508 {
1904 1, 1509 1,
1905 TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA, 1510 TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA,
1906 TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA, 1511 TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA,
1907 SSL_kEECDH, 1512 SSL_kECDHE|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1908 SSL_aRSA, 1513 SSL_NOT_EXP|SSL_HIGH,
1909 SSL_AES128, 1514 0,
1910 SSL_SHA1, 1515 128,
1911 SSL_TLSV1, 1516 128,
1912 SSL_NOT_EXP|SSL_HIGH, 1517 SSL_ALL_CIPHERS,
1913 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1518 SSL_ALL_STRENGTHS,
1914 128, 1519 },
1915 128,
1916 },
1917 1520
1918 /* Cipher C014 */ 1521 /* Cipher C014 */
1919 { 1522 {
1920 1, 1523 1,
1921 TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA, 1524 TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA,
1922 TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA, 1525 TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA,
1923 SSL_kEECDH, 1526 SSL_kECDHE|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
1924 SSL_aRSA, 1527 SSL_NOT_EXP|SSL_HIGH,
1925 SSL_AES256, 1528 0,
1926 SSL_SHA1, 1529 256,
1927 SSL_TLSV1, 1530 256,
1928 SSL_NOT_EXP|SSL_HIGH, 1531 SSL_ALL_CIPHERS,
1929 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1532 SSL_ALL_STRENGTHS,
1930 256, 1533 },
1931 256,
1932 },
1933 1534
1934 /* Cipher C015 */ 1535 /* Cipher C015 */
1935 { 1536 {
1936 1, 1537 1,
1937 TLS1_TXT_ECDH_anon_WITH_NULL_SHA, 1538 TLS1_TXT_ECDH_anon_WITH_NULL_SHA,
1938 TLS1_CK_ECDH_anon_WITH_NULL_SHA, 1539 TLS1_CK_ECDH_anon_WITH_NULL_SHA,
1939 SSL_kEECDH, 1540 SSL_kECDHE|SSL_aNULL|SSL_eNULL|SSL_SHA|SSL_TLSV1,
1940 SSL_aNULL, 1541 SSL_NOT_EXP,
1941 SSL_eNULL, 1542 0,
1942 SSL_SHA1, 1543 0,
1943 SSL_TLSV1, 1544 0,
1944 SSL_NOT_EXP|SSL_STRONG_NONE, 1545 SSL_ALL_CIPHERS,
1945 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1546 SSL_ALL_STRENGTHS,
1946 0, 1547 },
1947 0,
1948 },
1949 1548
1950 /* Cipher C016 */ 1549 /* Cipher C016 */
1951 { 1550 {
1952 1, 1551 1,
1953 TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA, 1552 TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA,
1954 TLS1_CK_ECDH_anon_WITH_RC4_128_SHA, 1553 TLS1_CK_ECDH_anon_WITH_RC4_128_SHA,
1955 SSL_kEECDH, 1554 SSL_kECDHE|SSL_aNULL|SSL_RC4|SSL_SHA|SSL_TLSV1,
1956 SSL_aNULL, 1555 SSL_NOT_EXP,
1957 SSL_RC4, 1556 0,
1958 SSL_SHA1, 1557 128,
1959 SSL_TLSV1, 1558 128,
1960 SSL_NOT_EXP|SSL_MEDIUM, 1559 SSL_ALL_CIPHERS,
1961 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1560 SSL_ALL_STRENGTHS,
1962 128, 1561 },
1963 128,
1964 },
1965 1562
1966 /* Cipher C017 */ 1563 /* Cipher C017 */
1967 { 1564 {
1968 1, 1565 1,
1969 TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA, 1566 TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA,
1970 TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA, 1567 TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA,
1971 SSL_kEECDH, 1568 SSL_kECDHE|SSL_aNULL|SSL_3DES|SSL_SHA|SSL_TLSV1,
1972 SSL_aNULL, 1569 SSL_NOT_EXP|SSL_HIGH,
1973 SSL_3DES, 1570 0,
1974 SSL_SHA1, 1571 168,
1975 SSL_TLSV1, 1572 168,
1976 SSL_NOT_EXP|SSL_HIGH, 1573 SSL_ALL_CIPHERS,
1977 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1574 SSL_ALL_STRENGTHS,
1978 168, 1575 },
1979 168,
1980 },
1981 1576
1982 /* Cipher C018 */ 1577 /* Cipher C018 */
1983 { 1578 {
1984 1, 1579 1,
1985 TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA, 1580 TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA,
1986 TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA, 1581 TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA,
1987 SSL_kEECDH, 1582 SSL_kECDHE|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
1988 SSL_aNULL, 1583 SSL_NOT_EXP|SSL_HIGH,
1989 SSL_AES128, 1584 0,
1990 SSL_SHA1, 1585 128,
1991 SSL_TLSV1, 1586 128,
1992 SSL_NOT_EXP|SSL_HIGH, 1587 SSL_ALL_CIPHERS,
1993 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1588 SSL_ALL_STRENGTHS,
1994 128, 1589 },
1995 128,
1996 },
1997 1590
1998 /* Cipher C019 */ 1591 /* Cipher C019 */
1999 { 1592 {
2000 1, 1593 1,
2001 TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA, 1594 TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA,
2002 TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA, 1595 TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA,
2003 SSL_kEECDH, 1596 SSL_kECDHE|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
2004 SSL_aNULL, 1597 SSL_NOT_EXP|SSL_HIGH,
2005 SSL_AES256, 1598 0,
2006 SSL_SHA1, 1599 256,
2007 SSL_TLSV1, 1600 256,
2008 SSL_NOT_EXP|SSL_HIGH, 1601 SSL_ALL_CIPHERS,
2009 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF, 1602 SSL_ALL_STRENGTHS,
2010 256, 1603 },
2011 256,
2012 },
2013#endif /* OPENSSL_NO_ECDH */ 1604#endif /* OPENSSL_NO_ECDH */
2014 1605
2015#ifdef TEMP_GOST_TLS
2016/* Cipher FF00 */
2017 {
2018 1,
2019 "GOST-MD5",
2020 0x0300ff00,
2021 SSL_kRSA,
2022 SSL_aRSA,
2023 SSL_eGOST2814789CNT,
2024 SSL_MD5,
2025 SSL_TLSV1,
2026 SSL_NOT_EXP|SSL_HIGH,
2027 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
2028 256,
2029 256,
2030 },
2031 {
2032 1,
2033 "GOST-GOST94",
2034 0x0300ff01,
2035 SSL_kRSA,
2036 SSL_aRSA,
2037 SSL_eGOST2814789CNT,
2038 SSL_GOST94,
2039 SSL_TLSV1,
2040 SSL_NOT_EXP|SSL_HIGH,
2041 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
2042 256,
2043 256
2044 },
2045 {
2046 1,
2047 "GOST-GOST89MAC",
2048 0x0300ff02,
2049 SSL_kRSA,
2050 SSL_aRSA,
2051 SSL_eGOST2814789CNT,
2052 SSL_GOST89MAC,
2053 SSL_TLSV1,
2054 SSL_NOT_EXP|SSL_HIGH,
2055 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
2056 256,
2057 256
2058 },
2059 {
2060 1,
2061 "GOST-GOST89STREAM",
2062 0x0300ff03,
2063 SSL_kRSA,
2064 SSL_aRSA,
2065 SSL_eGOST2814789CNT,
2066 SSL_GOST89MAC,
2067 SSL_TLSV1,
2068 SSL_NOT_EXP|SSL_HIGH,
2069 SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF|TLS1_STREAM_MAC,
2070 256,
2071 256
2072 },
2073#endif
2074 1606
2075/* end of list */ 1607/* end of list */
2076 }; 1608 };
2077 1609
2078SSL3_ENC_METHOD SSLv3_enc_data={ 1610SSL3_ENC_METHOD SSLv3_enc_data={
2079 ssl3_enc, 1611 ssl3_enc,
2080 n_ssl3_mac, 1612 ssl3_mac,
2081 ssl3_setup_key_block, 1613 ssl3_setup_key_block,
2082 ssl3_generate_master_secret, 1614 ssl3_generate_master_secret,
2083 ssl3_change_cipher_state, 1615 ssl3_change_cipher_state,
@@ -2096,12 +1628,17 @@ long ssl3_default_timeout(void)
2096 return(60*60*2); 1628 return(60*60*2);
2097 } 1629 }
2098 1630
1631IMPLEMENT_ssl3_meth_func(sslv3_base_method,
1632 ssl_undefined_function,
1633 ssl_undefined_function,
1634 ssl_bad_method)
1635
2099int ssl3_num_ciphers(void) 1636int ssl3_num_ciphers(void)
2100 { 1637 {
2101 return(SSL3_NUM_CIPHERS); 1638 return(SSL3_NUM_CIPHERS);
2102 } 1639 }
2103 1640
2104const SSL_CIPHER *ssl3_get_cipher(unsigned int u) 1641SSL_CIPHER *ssl3_get_cipher(unsigned int u)
2105 { 1642 {
2106 if (u < SSL3_NUM_CIPHERS) 1643 if (u < SSL3_NUM_CIPHERS)
2107 return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u])); 1644 return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u]));
@@ -2123,8 +1660,10 @@ int ssl3_new(SSL *s)
2123 1660
2124 if ((s3=OPENSSL_malloc(sizeof *s3)) == NULL) goto err; 1661 if ((s3=OPENSSL_malloc(sizeof *s3)) == NULL) goto err;
2125 memset(s3,0,sizeof *s3); 1662 memset(s3,0,sizeof *s3);
2126 memset(s3->rrec.seq_num,0,sizeof(s3->rrec.seq_num)); 1663 EVP_MD_CTX_init(&s3->finish_dgst1);
2127 memset(s3->wrec.seq_num,0,sizeof(s3->wrec.seq_num)); 1664 EVP_MD_CTX_init(&s3->finish_dgst2);
1665 pq_64bit_init(&(s3->rrec.seq_num));
1666 pq_64bit_init(&(s3->wrec.seq_num));
2128 1667
2129 s->s3=s3; 1668 s->s3=s3;
2130 1669
@@ -2139,18 +1678,11 @@ void ssl3_free(SSL *s)
2139 if(s == NULL) 1678 if(s == NULL)
2140 return; 1679 return;
2141 1680
2142#ifdef TLSEXT_TYPE_opaque_prf_input
2143 if (s->s3->client_opaque_prf_input != NULL)
2144 OPENSSL_free(s->s3->client_opaque_prf_input);
2145 if (s->s3->server_opaque_prf_input != NULL)
2146 OPENSSL_free(s->s3->server_opaque_prf_input);
2147#endif
2148
2149 ssl3_cleanup_key_block(s); 1681 ssl3_cleanup_key_block(s);
2150 if (s->s3->rbuf.buf != NULL) 1682 if (s->s3->rbuf.buf != NULL)
2151 ssl3_release_read_buffer(s); 1683 OPENSSL_free(s->s3->rbuf.buf);
2152 if (s->s3->wbuf.buf != NULL) 1684 if (s->s3->wbuf.buf != NULL)
2153 ssl3_release_write_buffer(s); 1685 OPENSSL_free(s->s3->wbuf.buf);
2154 if (s->s3->rrec.comp != NULL) 1686 if (s->s3->rrec.comp != NULL)
2155 OPENSSL_free(s->s3->rrec.comp); 1687 OPENSSL_free(s->s3->rrec.comp);
2156#ifndef OPENSSL_NO_DH 1688#ifndef OPENSSL_NO_DH
@@ -2164,10 +1696,11 @@ void ssl3_free(SSL *s)
2164 1696
2165 if (s->s3->tmp.ca_names != NULL) 1697 if (s->s3->tmp.ca_names != NULL)
2166 sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free); 1698 sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
2167 if (s->s3->handshake_buffer) { 1699 EVP_MD_CTX_cleanup(&s->s3->finish_dgst1);
2168 BIO_free(s->s3->handshake_buffer); 1700 EVP_MD_CTX_cleanup(&s->s3->finish_dgst2);
2169 } 1701 pq_64bit_free(&(s->s3->rrec.seq_num));
2170 if (s->s3->handshake_dgst) ssl3_free_digest_list(s); 1702 pq_64bit_free(&(s->s3->wrec.seq_num));
1703
2171 OPENSSL_cleanse(s->s3,sizeof *s->s3); 1704 OPENSSL_cleanse(s->s3,sizeof *s->s3);
2172 OPENSSL_free(s->s3); 1705 OPENSSL_free(s->s3);
2173 s->s3=NULL; 1706 s->s3=NULL;
@@ -2178,15 +1711,6 @@ void ssl3_clear(SSL *s)
2178 unsigned char *rp,*wp; 1711 unsigned char *rp,*wp;
2179 size_t rlen, wlen; 1712 size_t rlen, wlen;
2180 1713
2181#ifdef TLSEXT_TYPE_opaque_prf_input
2182 if (s->s3->client_opaque_prf_input != NULL)
2183 OPENSSL_free(s->s3->client_opaque_prf_input);
2184 s->s3->client_opaque_prf_input = NULL;
2185 if (s->s3->server_opaque_prf_input != NULL)
2186 OPENSSL_free(s->s3->server_opaque_prf_input);
2187 s->s3->server_opaque_prf_input = NULL;
2188#endif
2189
2190 ssl3_cleanup_key_block(s); 1714 ssl3_cleanup_key_block(s);
2191 if (s->s3->tmp.ca_names != NULL) 1715 if (s->s3->tmp.ca_names != NULL)
2192 sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free); 1716 sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
@@ -2209,13 +1733,10 @@ void ssl3_clear(SSL *s)
2209 wp = s->s3->wbuf.buf; 1733 wp = s->s3->wbuf.buf;
2210 rlen = s->s3->rbuf.len; 1734 rlen = s->s3->rbuf.len;
2211 wlen = s->s3->wbuf.len; 1735 wlen = s->s3->wbuf.len;
2212 if (s->s3->handshake_buffer) { 1736
2213 BIO_free(s->s3->handshake_buffer); 1737 EVP_MD_CTX_cleanup(&s->s3->finish_dgst1);
2214 s->s3->handshake_buffer = NULL; 1738 EVP_MD_CTX_cleanup(&s->s3->finish_dgst2);
2215 } 1739
2216 if (s->s3->handshake_dgst) {
2217 ssl3_free_digest_list(s);
2218 }
2219 memset(s->s3,0,sizeof *s->s3); 1740 memset(s->s3,0,sizeof *s->s3);
2220 s->s3->rbuf.buf = rp; 1741 s->s3->rbuf.buf = rp;
2221 s->s3->wbuf.buf = wp; 1742 s->s3->wbuf.buf = wp;
@@ -2415,31 +1936,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
2415 s->tlsext_debug_arg=parg; 1936 s->tlsext_debug_arg=parg;
2416 ret = 1; 1937 ret = 1;
2417 break; 1938 break;
2418 1939
2419#ifdef TLSEXT_TYPE_opaque_prf_input
2420 case SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT:
2421 if (larg > 12288) /* actual internal limit is 2^16 for the complete hello message
2422 * (including the cert chain and everything) */
2423 {
2424 SSLerr(SSL_F_SSL3_CTRL, SSL_R_OPAQUE_PRF_INPUT_TOO_LONG);
2425 break;
2426 }
2427 if (s->tlsext_opaque_prf_input != NULL)
2428 OPENSSL_free(s->tlsext_opaque_prf_input);
2429 if ((size_t)larg == 0)
2430 s->tlsext_opaque_prf_input = OPENSSL_malloc(1); /* dummy byte just to get non-NULL */
2431 else
2432 s->tlsext_opaque_prf_input = BUF_memdup(parg, (size_t)larg);
2433 if (s->tlsext_opaque_prf_input != NULL)
2434 {
2435 s->tlsext_opaque_prf_input_len = (size_t)larg;
2436 ret = 1;
2437 }
2438 else
2439 s->tlsext_opaque_prf_input_len = 0;
2440 break;
2441#endif
2442
2443 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE: 1940 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE:
2444 s->tlsext_status_type=larg; 1941 s->tlsext_status_type=larg;
2445 ret = 1; 1942 ret = 1;
@@ -2697,20 +2194,13 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
2697 } 2194 }
2698 return 1; 2195 return 1;
2699 } 2196 }
2700 2197
2701#ifdef TLSEXT_TYPE_opaque_prf_input
2702 case SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG:
2703 ctx->tlsext_opaque_prf_input_callback_arg = parg;
2704 return 1;
2705#endif
2706
2707 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG: 2198 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG:
2708 ctx->tlsext_status_arg=parg; 2199 ctx->tlsext_status_arg=parg;
2709 return 1; 2200 return 1;
2710 break; 2201 break;
2711 2202
2712#endif /* !OPENSSL_NO_TLSEXT */ 2203#endif /* !OPENSSL_NO_TLSEXT */
2713
2714 /* A Thawte special :-) */ 2204 /* A Thawte special :-) */
2715 case SSL_CTRL_EXTRA_CHAIN_CERT: 2205 case SSL_CTRL_EXTRA_CHAIN_CERT:
2716 if (ctx->extra_certs == NULL) 2206 if (ctx->extra_certs == NULL)
@@ -2760,13 +2250,7 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
2760 case SSL_CTRL_SET_TLSEXT_SERVERNAME_CB: 2250 case SSL_CTRL_SET_TLSEXT_SERVERNAME_CB:
2761 ctx->tlsext_servername_callback=(int (*)(SSL *,int *,void *))fp; 2251 ctx->tlsext_servername_callback=(int (*)(SSL *,int *,void *))fp;
2762 break; 2252 break;
2763 2253
2764#ifdef TLSEXT_TYPE_opaque_prf_input
2765 case SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB:
2766 ctx->tlsext_opaque_prf_input_callback = (int (*)(SSL *,void *, size_t, void *))fp;
2767 break;
2768#endif
2769
2770 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB: 2254 case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB:
2771 ctx->tlsext_status_cb=(int (*)(SSL *,void *))fp; 2255 ctx->tlsext_status_cb=(int (*)(SSL *,void *))fp;
2772 break; 2256 break;
@@ -2787,15 +2271,17 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
2787 2271
2788/* This function needs to check if the ciphers required are actually 2272/* This function needs to check if the ciphers required are actually
2789 * available */ 2273 * available */
2790const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p) 2274SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
2791 { 2275 {
2792 SSL_CIPHER c; 2276 SSL_CIPHER c,*cp;
2793 const SSL_CIPHER *cp;
2794 unsigned long id; 2277 unsigned long id;
2795 2278
2796 id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1]; 2279 id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
2797 c.id=id; 2280 c.id=id;
2798 cp = OBJ_bsearch_ssl_cipher_id(&c, ssl3_ciphers, SSL3_NUM_CIPHERS); 2281 cp = (SSL_CIPHER *)OBJ_bsearch((char *)&c,
2282 (char *)ssl3_ciphers,
2283 SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER),
2284 FP_ICC ssl_cipher_id_cmp);
2799 if (cp == NULL || cp->valid == 0) 2285 if (cp == NULL || cp->valid == 0)
2800 return NULL; 2286 return NULL;
2801 else 2287 else
@@ -2821,14 +2307,10 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
2821 { 2307 {
2822 SSL_CIPHER *c,*ret=NULL; 2308 SSL_CIPHER *c,*ret=NULL;
2823 STACK_OF(SSL_CIPHER) *prio, *allow; 2309 STACK_OF(SSL_CIPHER) *prio, *allow;
2824 int i,ii,ok; 2310 int i,j,ok;
2825#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_EC) 2311
2826 unsigned int j;
2827 int ec_ok, ec_nid;
2828 unsigned char ec_search1 = 0, ec_search2 = 0;
2829#endif
2830 CERT *cert; 2312 CERT *cert;
2831 unsigned long alg_k,alg_a,mask_k,mask_a,emask_k,emask_a; 2313 unsigned long alg,mask,emask;
2832 2314
2833 /* Let's see which ciphers we can support */ 2315 /* Let's see which ciphers we can support */
2834 cert=s->cert; 2316 cert=s->cert;
@@ -2844,237 +2326,73 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
2844#endif 2326#endif
2845 2327
2846#ifdef CIPHER_DEBUG 2328#ifdef CIPHER_DEBUG
2847 printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), (void *)srvr); 2329 printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), srvr);
2848 for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i) 2330 for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i)
2849 { 2331 {
2850 c=sk_SSL_CIPHER_value(srvr,i); 2332 c=sk_SSL_CIPHER_value(srvr,i);
2851 printf("%p:%s\n",(void *)c,c->name); 2333 printf("%p:%s\n",c,c->name);
2852 } 2334 }
2853 printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), (void *)clnt); 2335 printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), clnt);
2854 for(i=0 ; i < sk_SSL_CIPHER_num(clnt) ; ++i) 2336 for(i=0 ; i < sk_SSL_CIPHER_num(clnt) ; ++i)
2855 { 2337 {
2856 c=sk_SSL_CIPHER_value(clnt,i); 2338 c=sk_SSL_CIPHER_value(clnt,i);
2857 printf("%p:%s\n",(void *)c,c->name); 2339 printf("%p:%s\n",c,c->name);
2858 } 2340 }
2859#endif 2341#endif
2860 2342
2861 if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) 2343 if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE)
2862 { 2344 {
2863 prio = srvr; 2345 prio = srvr;
2864 allow = clnt; 2346 allow = clnt;
2865 } 2347 }
2866 else 2348 else
2867 { 2349 {
2868 prio = clnt; 2350 prio = clnt;
2869 allow = srvr; 2351 allow = srvr;
2870 } 2352 }
2871 2353
2872 for (i=0; i<sk_SSL_CIPHER_num(prio); i++) 2354 for (i=0; i<sk_SSL_CIPHER_num(prio); i++)
2873 { 2355 {
2874 c=sk_SSL_CIPHER_value(prio,i); 2356 c=sk_SSL_CIPHER_value(prio,i);
2875 2357
2876 ssl_set_cert_masks(cert,c); 2358 ssl_set_cert_masks(cert,c);
2877 mask_k = cert->mask_k; 2359 mask=cert->mask;
2878 mask_a = cert->mask_a; 2360 emask=cert->export_mask;
2879 emask_k = cert->export_mask_k;
2880 emask_a = cert->export_mask_a;
2881 2361
2882#ifdef KSSL_DEBUG 2362#ifdef KSSL_DEBUG
2883/* printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);*/ 2363 printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);
2884#endif /* KSSL_DEBUG */ 2364#endif /* KSSL_DEBUG */
2885 2365
2886 alg_k=c->algorithm_mkey; 2366 alg=c->algorithms&(SSL_MKEY_MASK|SSL_AUTH_MASK);
2887 alg_a=c->algorithm_auth;
2888
2889#ifndef OPENSSL_NO_KRB5 2367#ifndef OPENSSL_NO_KRB5
2890 if (alg_k & SSL_kKRB5) 2368 if (alg & SSL_KRB5)
2891 { 2369 {
2892 if ( !kssl_keytab_is_available(s->kssl_ctx) ) 2370 if ( !kssl_keytab_is_available(s->kssl_ctx) )
2893 continue; 2371 continue;
2894 } 2372 }
2895#endif /* OPENSSL_NO_KRB5 */ 2373#endif /* OPENSSL_NO_KRB5 */
2896#ifndef OPENSSL_NO_PSK
2897 /* with PSK there must be server callback set */
2898 if ((alg_k & SSL_kPSK) && s->psk_server_callback == NULL)
2899 continue;
2900#endif /* OPENSSL_NO_PSK */
2901
2902 if (SSL_C_IS_EXPORT(c)) 2374 if (SSL_C_IS_EXPORT(c))
2903 { 2375 {
2904 ok = (alg_k & emask_k) && (alg_a & emask_a); 2376 ok=((alg & emask) == alg)?1:0;
2905#ifdef CIPHER_DEBUG 2377#ifdef CIPHER_DEBUG
2906 printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)\n",ok,alg_k,alg_a,emask_k,emask_a, 2378 printf("%d:[%08lX:%08lX]%p:%s (export)\n",ok,alg,emask,
2907 (void *)c,c->name); 2379 c,c->name);
2908#endif 2380#endif
2909 } 2381 }
2910 else 2382 else
2911 { 2383 {
2912 ok = (alg_k & mask_k) && (alg_a & mask_a); 2384 ok=((alg & mask) == alg)?1:0;
2913#ifdef CIPHER_DEBUG 2385#ifdef CIPHER_DEBUG
2914 printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n",ok,alg_k,alg_a,mask_k,mask_a,(void *)c, 2386 printf("%d:[%08lX:%08lX]%p:%s\n",ok,alg,mask,c,
2915 c->name); 2387 c->name);
2916#endif 2388#endif
2917 } 2389 }
2918 2390
2919#ifndef OPENSSL_NO_TLSEXT
2920#ifndef OPENSSL_NO_EC
2921 if (
2922 /* if we are considering an ECC cipher suite that uses our certificate */
2923 (alg_a & SSL_aECDSA || alg_a & SSL_aECDH)
2924 /* and we have an ECC certificate */
2925 && (s->cert->pkeys[SSL_PKEY_ECC].x509 != NULL)
2926 /* and the client specified a Supported Point Formats extension */
2927 && ((s->session->tlsext_ecpointformatlist_length > 0) && (s->session->tlsext_ecpointformatlist != NULL))
2928 /* and our certificate's point is compressed */
2929 && (
2930 (s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info != NULL)
2931 && (s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key != NULL)
2932 && (s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key != NULL)
2933 && (s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key->data != NULL)
2934 && (
2935 (*(s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key->data) == POINT_CONVERSION_COMPRESSED)
2936 || (*(s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key->data) == POINT_CONVERSION_COMPRESSED + 1)
2937 )
2938 )
2939 )
2940 {
2941 ec_ok = 0;
2942 /* if our certificate's curve is over a field type that the client does not support
2943 * then do not allow this cipher suite to be negotiated */
2944 if (
2945 (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec != NULL)
2946 && (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group != NULL)
2947 && (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth != NULL)
2948 && (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_prime_field)
2949 )
2950 {
2951 for (j = 0; j < s->session->tlsext_ecpointformatlist_length; j++)
2952 {
2953 if (s->session->tlsext_ecpointformatlist[j] == TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime)
2954 {
2955 ec_ok = 1;
2956 break;
2957 }
2958 }
2959 }
2960 else if (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_characteristic_two_field)
2961 {
2962 for (j = 0; j < s->session->tlsext_ecpointformatlist_length; j++)
2963 {
2964 if (s->session->tlsext_ecpointformatlist[j] == TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2)
2965 {
2966 ec_ok = 1;
2967 break;
2968 }
2969 }
2970 }
2971 ok = ok && ec_ok;
2972 }
2973 if (
2974 /* if we are considering an ECC cipher suite that uses our certificate */
2975 (alg_a & SSL_aECDSA || alg_a & SSL_aECDH)
2976 /* and we have an ECC certificate */
2977 && (s->cert->pkeys[SSL_PKEY_ECC].x509 != NULL)
2978 /* and the client specified an EllipticCurves extension */
2979 && ((s->session->tlsext_ellipticcurvelist_length > 0) && (s->session->tlsext_ellipticcurvelist != NULL))
2980 )
2981 {
2982 ec_ok = 0;
2983 if (
2984 (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec != NULL)
2985 && (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group != NULL)
2986 )
2987 {
2988 ec_nid = EC_GROUP_get_curve_name(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group);
2989 if ((ec_nid == 0)
2990 && (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth != NULL)
2991 )
2992 {
2993 if (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_prime_field)
2994 {
2995 ec_search1 = 0xFF;
2996 ec_search2 = 0x01;
2997 }
2998 else if (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_characteristic_two_field)
2999 {
3000 ec_search1 = 0xFF;
3001 ec_search2 = 0x02;
3002 }
3003 }
3004 else
3005 {
3006 ec_search1 = 0x00;
3007 ec_search2 = tls1_ec_nid2curve_id(ec_nid);
3008 }
3009 if ((ec_search1 != 0) || (ec_search2 != 0))
3010 {
3011 for (j = 0; j < s->session->tlsext_ellipticcurvelist_length / 2; j++)
3012 {
3013 if ((s->session->tlsext_ellipticcurvelist[2*j] == ec_search1) && (s->session->tlsext_ellipticcurvelist[2*j+1] == ec_search2))
3014 {
3015 ec_ok = 1;
3016 break;
3017 }
3018 }
3019 }
3020 }
3021 ok = ok && ec_ok;
3022 }
3023 if (
3024 /* if we are considering an ECC cipher suite that uses an ephemeral EC key */
3025 (alg_k & SSL_kEECDH)
3026 /* and we have an ephemeral EC key */
3027 && (s->cert->ecdh_tmp != NULL)
3028 /* and the client specified an EllipticCurves extension */
3029 && ((s->session->tlsext_ellipticcurvelist_length > 0) && (s->session->tlsext_ellipticcurvelist != NULL))
3030 )
3031 {
3032 ec_ok = 0;
3033 if (s->cert->ecdh_tmp->group != NULL)
3034 {
3035 ec_nid = EC_GROUP_get_curve_name(s->cert->ecdh_tmp->group);
3036 if ((ec_nid == 0)
3037 && (s->cert->ecdh_tmp->group->meth != NULL)
3038 )
3039 {
3040 if (EC_METHOD_get_field_type(s->cert->ecdh_tmp->group->meth) == NID_X9_62_prime_field)
3041 {
3042 ec_search1 = 0xFF;
3043 ec_search2 = 0x01;
3044 }
3045 else if (EC_METHOD_get_field_type(s->cert->ecdh_tmp->group->meth) == NID_X9_62_characteristic_two_field)
3046 {
3047 ec_search1 = 0xFF;
3048 ec_search2 = 0x02;
3049 }
3050 }
3051 else
3052 {
3053 ec_search1 = 0x00;
3054 ec_search2 = tls1_ec_nid2curve_id(ec_nid);
3055 }
3056 if ((ec_search1 != 0) || (ec_search2 != 0))
3057 {
3058 for (j = 0; j < s->session->tlsext_ellipticcurvelist_length / 2; j++)
3059 {
3060 if ((s->session->tlsext_ellipticcurvelist[2*j] == ec_search1) && (s->session->tlsext_ellipticcurvelist[2*j+1] == ec_search2))
3061 {
3062 ec_ok = 1;
3063 break;
3064 }
3065 }
3066 }
3067 }
3068 ok = ok && ec_ok;
3069 }
3070#endif /* OPENSSL_NO_EC */
3071#endif /* OPENSSL_NO_TLSEXT */
3072
3073 if (!ok) continue; 2391 if (!ok) continue;
3074 ii=sk_SSL_CIPHER_find(allow,c); 2392 j=sk_SSL_CIPHER_find(allow,c);
3075 if (ii >= 0) 2393 if (j >= 0)
3076 { 2394 {
3077 ret=sk_SSL_CIPHER_value(allow,ii); 2395 ret=sk_SSL_CIPHER_value(allow,j);
3078 break; 2396 break;
3079 } 2397 }
3080 } 2398 }
@@ -3084,24 +2402,12 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
3084int ssl3_get_req_cert_type(SSL *s, unsigned char *p) 2402int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
3085 { 2403 {
3086 int ret=0; 2404 int ret=0;
3087 unsigned long alg_k; 2405 unsigned long alg;
3088
3089 alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
3090 2406
3091#ifndef OPENSSL_NO_GOST 2407 alg=s->s3->tmp.new_cipher->algorithms;
3092 if (s->version >= TLS1_VERSION)
3093 {
3094 if (alg_k & SSL_kGOST)
3095 {
3096 p[ret++]=TLS_CT_GOST94_SIGN;
3097 p[ret++]=TLS_CT_GOST01_SIGN;
3098 return(ret);
3099 }
3100 }
3101#endif
3102 2408
3103#ifndef OPENSSL_NO_DH 2409#ifndef OPENSSL_NO_DH
3104 if (alg_k & (SSL_kDHr|SSL_kEDH)) 2410 if (alg & (SSL_kDHr|SSL_kEDH))
3105 { 2411 {
3106# ifndef OPENSSL_NO_RSA 2412# ifndef OPENSSL_NO_RSA
3107 p[ret++]=SSL3_CT_RSA_FIXED_DH; 2413 p[ret++]=SSL3_CT_RSA_FIXED_DH;
@@ -3111,7 +2417,7 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
3111# endif 2417# endif
3112 } 2418 }
3113 if ((s->version == SSL3_VERSION) && 2419 if ((s->version == SSL3_VERSION) &&
3114 (alg_k & (SSL_kEDH|SSL_kDHd|SSL_kDHr))) 2420 (alg & (SSL_kEDH|SSL_kDHd|SSL_kDHr)))
3115 { 2421 {
3116# ifndef OPENSSL_NO_RSA 2422# ifndef OPENSSL_NO_RSA
3117 p[ret++]=SSL3_CT_RSA_EPHEMERAL_DH; 2423 p[ret++]=SSL3_CT_RSA_EPHEMERAL_DH;
@@ -3128,7 +2434,10 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
3128 p[ret++]=SSL3_CT_DSS_SIGN; 2434 p[ret++]=SSL3_CT_DSS_SIGN;
3129#endif 2435#endif
3130#ifndef OPENSSL_NO_ECDH 2436#ifndef OPENSSL_NO_ECDH
3131 if ((alg_k & (SSL_kECDHr|SSL_kECDHe)) && (s->version >= TLS1_VERSION)) 2437 /* We should ask for fixed ECDH certificates only
2438 * for SSL_kECDH (and not SSL_kECDHE)
2439 */
2440 if ((alg & SSL_kECDH) && (s->version >= TLS1_VERSION))
3132 { 2441 {
3133 p[ret++]=TLS_CT_RSA_FIXED_ECDH; 2442 p[ret++]=TLS_CT_RSA_FIXED_ECDH;
3134 p[ret++]=TLS_CT_ECDSA_FIXED_ECDH; 2443 p[ret++]=TLS_CT_ECDSA_FIXED_ECDH;
@@ -3137,7 +2446,7 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
3137 2446
3138#ifndef OPENSSL_NO_ECDSA 2447#ifndef OPENSSL_NO_ECDSA
3139 /* ECDSA certs can be used with RSA cipher suites as well 2448 /* ECDSA certs can be used with RSA cipher suites as well
3140 * so we don't need to check for SSL_kECDH or SSL_kEECDH 2449 * so we don't need to check for SSL_kECDH or SSL_kECDHE
3141 */ 2450 */
3142 if (s->version >= TLS1_VERSION) 2451 if (s->version >= TLS1_VERSION)
3143 { 2452 {
@@ -3149,7 +2458,6 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
3149 2458
3150int ssl3_shutdown(SSL *s) 2459int ssl3_shutdown(SSL *s)
3151 { 2460 {
3152 int ret;
3153 2461
3154 /* Don't do anything much if we have not done the handshake or 2462 /* Don't do anything much if we have not done the handshake or
3155 * we don't want to send messages :-) */ 2463 * we don't want to send messages :-) */
@@ -3167,32 +2475,18 @@ int ssl3_shutdown(SSL *s)
3167#endif 2475#endif
3168 /* our shutdown alert has been sent now, and if it still needs 2476 /* our shutdown alert has been sent now, and if it still needs
3169 * to be written, s->s3->alert_dispatch will be true */ 2477 * to be written, s->s3->alert_dispatch will be true */
3170 if (s->s3->alert_dispatch)
3171 return(-1); /* return WANT_WRITE */
3172 } 2478 }
3173 else if (s->s3->alert_dispatch) 2479 else if (s->s3->alert_dispatch)
3174 { 2480 {
3175 /* resend it if not sent */ 2481 /* resend it if not sent */
3176#if 1 2482#if 1
3177 ret=s->method->ssl_dispatch_alert(s); 2483 s->method->ssl_dispatch_alert(s);
3178 if(ret == -1)
3179 {
3180 /* we only get to return -1 here the 2nd/Nth
3181 * invocation, we must have already signalled
3182 * return 0 upon a previous invoation,
3183 * return WANT_WRITE */
3184 return(ret);
3185 }
3186#endif 2484#endif
3187 } 2485 }
3188 else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN)) 2486 else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
3189 { 2487 {
3190 /* If we are waiting for a close from our peer, we are closed */ 2488 /* If we are waiting for a close from our peer, we are closed */
3191 s->method->ssl_read_bytes(s,0,NULL,0,0); 2489 s->method->ssl_read_bytes(s,0,NULL,0,0);
3192 if(!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
3193 {
3194 return(-1); /* return WANT_READ */
3195 }
3196 } 2490 }
3197 2491
3198 if ((s->shutdown == (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) && 2492 if ((s->shutdown == (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) &&
@@ -3298,6 +2592,9 @@ int ssl3_renegotiate(SSL *s)
3298 if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) 2592 if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
3299 return(0); 2593 return(0);
3300 2594
2595 if (!(s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
2596 return(0);
2597
3301 s->s3->renegotiate=1; 2598 s->s3->renegotiate=1;
3302 return(1); 2599 return(1);
3303 } 2600 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-26 22:57:29 +0000