s3_lib.c 64.1 KB
Newer Older
1
/* ssl/s3_lib.c */
2
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */
B
Bodo Möller 已提交
58
/* ====================================================================
59
 * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
B
Bodo Möller 已提交
60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer. 
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    openssl-core@openssl.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@cryptsoft.com).
 *
 */
B
Bodo Möller 已提交
111 112 113 114 115 116 117 118 119 120 121 122 123
/* ====================================================================
 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
 *
 * Portions of the attached software ("Contribution") are developed by 
 * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
 *
 * The Contribution is licensed pursuant to the OpenSSL open source
 * license provided above.
 *
 * ECC cipher suite support in OpenSSL originally written by
 * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
 *
 */
124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
/* ====================================================================
 * Copyright 2005 Nokia. All rights reserved.
 *
 * The portions of the attached software ("Contribution") is developed by
 * Nokia Corporation and is licensed pursuant to the OpenSSL open source
 * license.
 *
 * The Contribution, originally written by Mika Kousa and Pasi Eronen of
 * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
 * support (see RFC 4279) to OpenSSL.
 *
 * No patent licenses or other rights except those expressly stated in
 * the OpenSSL open source license shall be deemed granted or received
 * expressly, by implication, estoppel, or otherwise.
 *
 * No assurances are provided by Nokia that the Contribution does not
 * infringe the patent or other intellectual property rights of any third
 * party or that the license provides you with all the necessary rights
 * to make use of the Contribution.
 *
 * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
 * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
 * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
 * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
 * OTHERWISE.
 */
150 151

#include <stdio.h>
152
#include <openssl/objects.h>
153
#include "ssl_locl.h"
154
#include "kssl_lcl.h"
155 156 157 158 159
#ifndef OPENSSL_NO_TLSEXT
#ifndef OPENSSL_NO_EC
#include "../crypto/ec/ec_lcl.h"
#endif /* OPENSSL_NO_EC */
#endif /* OPENSSL_NO_TLSEXT */
160
#include <openssl/md5.h>
N
make  
Nils Larsch 已提交
161
#ifndef OPENSSL_NO_DH
162
#include <openssl/dh.h>
N
make  
Nils Larsch 已提交
163
#endif
164

165
const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT;
166 167 168

#define SSL3_NUM_CIPHERS	(sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER))

169
/* list of available SSLv3 ciphers (sorted by id) */
B
Bodo Möller 已提交
170
OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
171

172 173 174 175 176 177
/* The RSA ciphers */
/* Cipher 01 */
	{
	1,
	SSL3_TXT_RSA_NULL_MD5,
	SSL3_CK_RSA_NULL_MD5,
178 179 180 181 182
	SSL_kRSA,
	SSL_aRSA,
	SSL_eNULL,
	SSL_MD5,
	SSL_SSLV3,
183
	SSL_NOT_EXP|SSL_STRONG_NONE,
184
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
185
	0,
186 187
	0,
	},
188

189 190 191 192 193
/* Cipher 02 */
	{
	1,
	SSL3_TXT_RSA_NULL_SHA,
	SSL3_CK_RSA_NULL_SHA,
194 195 196 197 198
	SSL_kRSA,
	SSL_aRSA,
	SSL_eNULL,
	SSL_SHA1,
	SSL_SSLV3,
199
	SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
200
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
201
	0,
202 203
	0,
	},
204

205 206 207 208 209
/* Cipher 03 */
	{
	1,
	SSL3_TXT_RSA_RC4_40_MD5,
	SSL3_CK_RSA_RC4_40_MD5,
210 211 212 213 214
	SSL_kRSA,
	SSL_aRSA,
	SSL_RC4,
	SSL_MD5,
	SSL_SSLV3,
215
	SSL_EXPORT|SSL_EXP40,
216
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
217 218
	40,
	128,
219
	},
220

221 222 223 224 225
/* Cipher 04 */
	{
	1,
	SSL3_TXT_RSA_RC4_128_MD5,
	SSL3_CK_RSA_RC4_128_MD5,
226 227 228 229 230
	SSL_kRSA,
	SSL_aRSA,
	SSL_RC4,
	SSL_MD5,
	SSL_SSLV3,
231
	SSL_NOT_EXP|SSL_MEDIUM,
232
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
233 234
	128,
	128,
235
	},
236

237 238 239 240 241
/* Cipher 05 */
	{
	1,
	SSL3_TXT_RSA_RC4_128_SHA,
	SSL3_CK_RSA_RC4_128_SHA,
242 243 244 245 246
	SSL_kRSA,
	SSL_aRSA,
	SSL_RC4,
	SSL_SHA1,
	SSL_SSLV3,
247
	SSL_NOT_EXP|SSL_MEDIUM,
248
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
249 250
	128,
	128,
251
	},
252

253 254 255 256 257
/* Cipher 06 */
	{
	1,
	SSL3_TXT_RSA_RC2_40_MD5,
	SSL3_CK_RSA_RC2_40_MD5,
258 259 260 261 262
	SSL_kRSA,
	SSL_aRSA,
	SSL_RC2,
	SSL_MD5,
	SSL_SSLV3,
263
	SSL_EXPORT|SSL_EXP40,
264
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
265 266
	40,
	128,
267
	},
268

269
/* Cipher 07 */
270
#ifndef OPENSSL_NO_IDEA
271 272 273 274
	{
	1,
	SSL3_TXT_RSA_IDEA_128_SHA,
	SSL3_CK_RSA_IDEA_128_SHA,
275 276 277 278 279
	SSL_kRSA,
	SSL_aRSA,
	SSL_IDEA,
	SSL_SHA1,
	SSL_SSLV3,
280
	SSL_NOT_EXP|SSL_MEDIUM,
281
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
282 283
	128,
	128,
284
	},
285
#endif
286

287 288 289 290 291
/* Cipher 08 */
	{
	1,
	SSL3_TXT_RSA_DES_40_CBC_SHA,
	SSL3_CK_RSA_DES_40_CBC_SHA,
292 293 294 295 296
	SSL_kRSA,
	SSL_aRSA,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
297
	SSL_EXPORT|SSL_EXP40,
298
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
299 300
	40,
	56,
301
	},
302

303 304 305 306 307
/* Cipher 09 */
	{
	1,
	SSL3_TXT_RSA_DES_64_CBC_SHA,
	SSL3_CK_RSA_DES_64_CBC_SHA,
308 309 310 311 312
	SSL_kRSA,
	SSL_aRSA,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
313
	SSL_NOT_EXP|SSL_LOW,
314
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
315 316
	56,
	56,
317
	},
318

319 320 321 322 323
/* Cipher 0A */
	{
	1,
	SSL3_TXT_RSA_DES_192_CBC3_SHA,
	SSL3_CK_RSA_DES_192_CBC3_SHA,
324 325 326 327 328
	SSL_kRSA,
	SSL_aRSA,
	SSL_3DES,
	SSL_SHA1,
	SSL_SSLV3,
329
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
330
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
331 332
	168,
	168,
333
	},
334

335
/* The DH ciphers */
336 337 338 339 340
/* Cipher 0B */
	{
	0,
	SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
	SSL3_CK_DH_DSS_DES_40_CBC_SHA,
341 342 343 344 345
	SSL_kDHd,
	SSL_aDH,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
346
	SSL_EXPORT|SSL_EXP40,
347
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
348 349
	40,
	56,
350
	},
351

352 353
/* Cipher 0C */
	{
354
	0, /* not implemented (non-ephemeral DH) */
355 356
	SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
	SSL3_CK_DH_DSS_DES_64_CBC_SHA,
357 358 359 360 361
	SSL_kDHd,
	SSL_aDH,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
362
	SSL_NOT_EXP|SSL_LOW,
363
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
364 365
	56,
	56,
366
	},
367

368 369
/* Cipher 0D */
	{
370
	0, /* not implemented (non-ephemeral DH) */
371 372
	SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
	SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
373 374 375 376 377
	SSL_kDHd,
	SSL_aDH,
	SSL_3DES,
	SSL_SHA1,
	SSL_SSLV3,
378
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
379
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
380 381
	168,
	168,
382
	},
383

384 385
/* Cipher 0E */
	{
386
	0, /* not implemented (non-ephemeral DH) */
387 388
	SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
	SSL3_CK_DH_RSA_DES_40_CBC_SHA,
389 390 391 392 393
	SSL_kDHr,
	SSL_aDH,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
394
	SSL_EXPORT|SSL_EXP40,
395
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
396 397
	40,
	56,
398
	},
399

400 401
/* Cipher 0F */
	{
402
	0, /* not implemented (non-ephemeral DH) */
403 404
	SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
	SSL3_CK_DH_RSA_DES_64_CBC_SHA,
405 406 407 408 409
	SSL_kDHr,
	SSL_aDH,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
410
	SSL_NOT_EXP|SSL_LOW,
411
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
412 413
	56,
	56,
414
	},
415

416 417
/* Cipher 10 */
	{
418
	0, /* not implemented (non-ephemeral DH) */
419 420
	SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
	SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
421 422 423 424 425
	SSL_kDHr,
	SSL_aDH,
	SSL_3DES,
	SSL_SHA1,
	SSL_SSLV3,
426
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
427
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
428 429
	168,
	168,
430 431 432 433 434 435 436 437
	},

/* The Ephemeral DH ciphers */
/* Cipher 11 */
	{
	1,
	SSL3_TXT_EDH_DSS_DES_40_CBC_SHA,
	SSL3_CK_EDH_DSS_DES_40_CBC_SHA,
438 439 440 441 442
	SSL_kEDH,
	SSL_aDSS,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
443
	SSL_EXPORT|SSL_EXP40,
444
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
445 446
	40,
	56,
447
	},
448

449 450 451 452 453
/* Cipher 12 */
	{
	1,
	SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
	SSL3_CK_EDH_DSS_DES_64_CBC_SHA,
454 455 456 457 458
	SSL_kEDH,
	SSL_aDSS,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
459
	SSL_NOT_EXP|SSL_LOW,
460
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
461 462
	56,
	56,
463
	},
464

465 466 467 468 469
/* Cipher 13 */
	{
	1,
	SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,
	SSL3_CK_EDH_DSS_DES_192_CBC3_SHA,
470 471 472 473 474
	SSL_kEDH,
	SSL_aDSS,
	SSL_3DES,
	SSL_SHA1,
	SSL_SSLV3,
475
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
476
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
477 478
	168,
	168,
479
	},
480

481 482 483 484 485
/* Cipher 14 */
	{
	1,
	SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
	SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
486 487 488 489 490
	SSL_kEDH,
	SSL_aRSA,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
491
	SSL_EXPORT|SSL_EXP40,
492
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
493 494
	40,
	56,
495
	},
496

497 498 499 500 501
/* Cipher 15 */
	{
	1,
	SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
	SSL3_CK_EDH_RSA_DES_64_CBC_SHA,
502 503 504 505 506
	SSL_kEDH,
	SSL_aRSA,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
507
	SSL_NOT_EXP|SSL_LOW,
508
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
509 510
	56,
	56,
511
	},
512

513 514 515 516 517
/* Cipher 16 */
	{
	1,
	SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,
	SSL3_CK_EDH_RSA_DES_192_CBC3_SHA,
518 519 520 521 522
	SSL_kEDH,
	SSL_aRSA,
	SSL_3DES,
	SSL_SHA1,
	SSL_SSLV3,
523
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
524
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
525 526
	168,
	168,
527
	},
528

529 530 531 532 533
/* Cipher 17 */
	{
	1,
	SSL3_TXT_ADH_RC4_40_MD5,
	SSL3_CK_ADH_RC4_40_MD5,
534 535 536 537 538
	SSL_kEDH,
	SSL_aNULL,
	SSL_RC4,
	SSL_MD5,
	SSL_SSLV3,
539
	SSL_EXPORT|SSL_EXP40,
540
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
541 542 543
	40,
	128,
	},
544

545 546 547 548 549
/* Cipher 18 */
	{
	1,
	SSL3_TXT_ADH_RC4_128_MD5,
	SSL3_CK_ADH_RC4_128_MD5,
550 551 552 553 554
	SSL_kEDH,
	SSL_aNULL,
	SSL_RC4,
	SSL_MD5,
	SSL_SSLV3,
555
	SSL_NOT_EXP|SSL_MEDIUM,
556
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
557 558 559
	128,
	128,
	},
560

561 562 563 564 565
/* Cipher 19 */
	{
	1,
	SSL3_TXT_ADH_DES_40_CBC_SHA,
	SSL3_CK_ADH_DES_40_CBC_SHA,
566 567 568 569 570
	SSL_kEDH,
	SSL_aNULL,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
571
	SSL_EXPORT|SSL_EXP40,
572
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
573 574 575
	40,
	128,
	},
576

577 578 579 580 581
/* Cipher 1A */
	{
	1,
	SSL3_TXT_ADH_DES_64_CBC_SHA,
	SSL3_CK_ADH_DES_64_CBC_SHA,
582 583 584 585 586
	SSL_kEDH,
	SSL_aNULL,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
587
	SSL_NOT_EXP|SSL_LOW,
588
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
589 590 591
	56,
	56,
	},
592

593 594 595 596 597
/* Cipher 1B */
	{
	1,
	SSL3_TXT_ADH_DES_192_CBC_SHA,
	SSL3_CK_ADH_DES_192_CBC_SHA,
598 599 600 601 602
	SSL_kEDH,
	SSL_aNULL,
	SSL_3DES,
	SSL_SHA1,
	SSL_SSLV3,
603
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
604
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
605 606 607
	168,
	168,
	},
608

609 610
/* Fortezza ciphersuite from SSL 3.0 spec */
#if 0
611 612 613 614 615
/* Cipher 1C */
	{
	0,
	SSL3_TXT_FZA_DMS_NULL_SHA,
	SSL3_CK_FZA_DMS_NULL_SHA,
616 617 618 619 620
	SSL_kFZA,
	SSL_aFZA,
	SSL_eNULL,
	SSL_SHA1,
	SSL_SSLV3,
621
	SSL_NOT_EXP|SSL_STRONG_NONE,
622
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
623
	0,
624 625 626 627 628 629 630 631
	0,
	},

/* Cipher 1D */
	{
	0,
	SSL3_TXT_FZA_DMS_FZA_SHA,
	SSL3_CK_FZA_DMS_FZA_SHA,
632 633 634 635 636
	SSL_kFZA,
	SSL_aFZA,
	SSL_eFZA,
	SSL_SHA1,
	SSL_SSLV3,
637
	SSL_NOT_EXP|SSL_STRONG_NONE,
638
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
639
	0,
640 641 642 643 644 645 646 647
	0,
	},

/* Cipher 1E */
	{
	0,
	SSL3_TXT_FZA_DMS_RC4_SHA,
	SSL3_CK_FZA_DMS_RC4_SHA,
648 649 650 651 652
	SSL_kFZA,
	SSL_aFZA,
	SSL_RC4,
	SSL_SHA1,
	SSL_SSLV3,
L
Lutz Jänicke 已提交
653
	SSL_NOT_EXP|SSL_MEDIUM,
654
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
655 656
	128,
	128,
657
	},
658
#endif
659

660
#ifndef OPENSSL_NO_KRB5
B
Bodo Möller 已提交
661
/* The Kerberos ciphers*/
662
/* Cipher 1E */
663 664
	{
	1,
665 666
	SSL3_TXT_KRB5_DES_64_CBC_SHA,
	SSL3_CK_KRB5_DES_64_CBC_SHA,
667 668 669 670 671
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_DES,
	SSL_SHA1,
	SSL_SSLV3,
672
	SSL_NOT_EXP|SSL_LOW,
673
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
674
	56,
675 676 677
	56,
	},

678
/* Cipher 1F */
679 680
	{
	1,
681 682
	SSL3_TXT_KRB5_DES_192_CBC3_SHA,
	SSL3_CK_KRB5_DES_192_CBC3_SHA,
683 684 685 686 687
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_3DES,
	SSL_SHA1,
	SSL_SSLV3,
688
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
689
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
690
	168,
691
	168,
692 693
	},

694
/* Cipher 20 */
695 696
	{
	1,
697 698
	SSL3_TXT_KRB5_RC4_128_SHA,
	SSL3_CK_KRB5_RC4_128_SHA,
699 700
	SSL_kKRB5,
	SSL_aKRB5,
701 702 703
	SSL_RC4,
	SSL_SHA1,
	SSL_SSLV3,
704
	SSL_NOT_EXP|SSL_MEDIUM,
705
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
706 707
	128,
	128,
708 709
	},

710
/* Cipher 21 */
711 712 713 714
	{
	1,
	SSL3_TXT_KRB5_IDEA_128_CBC_SHA,
	SSL3_CK_KRB5_IDEA_128_CBC_SHA,
715 716 717 718 719
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_IDEA,
	SSL_SHA1,
	SSL_SSLV3,
720
	SSL_NOT_EXP|SSL_MEDIUM,
721
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
722 723 724 725
	128,
	128,
	},

726
/* Cipher 22 */
727 728 729 730
	{
	1,
	SSL3_TXT_KRB5_DES_64_CBC_MD5,
	SSL3_CK_KRB5_DES_64_CBC_MD5,
731 732 733 734 735
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_DES,
	SSL_MD5,
	SSL_SSLV3,
736
	SSL_NOT_EXP|SSL_LOW,
737
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
738 739 740 741
	56,
	56,
	},

742
/* Cipher 23 */
743 744
	{
	1,
745 746
	SSL3_TXT_KRB5_DES_192_CBC3_MD5,
	SSL3_CK_KRB5_DES_192_CBC3_MD5,
747 748 749 750 751
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_3DES,
	SSL_MD5,
	SSL_SSLV3,
752
	SSL_NOT_EXP|SSL_HIGH,
753
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
754
	168,
755 756 757
	168,
	},

758
/* Cipher 24 */
759 760 761 762
	{
	1,
	SSL3_TXT_KRB5_RC4_128_MD5,
	SSL3_CK_KRB5_RC4_128_MD5,
763 764 765 766 767
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_RC4,
	SSL_MD5,
	SSL_SSLV3,
768
	SSL_NOT_EXP|SSL_MEDIUM,
769
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
770 771 772 773
	128,
	128,
	},

774
/* Cipher 25 */
775 776 777 778
	{
	1,
	SSL3_TXT_KRB5_IDEA_128_CBC_MD5,
	SSL3_CK_KRB5_IDEA_128_CBC_MD5,
779 780 781 782 783
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_IDEA,
	SSL_MD5,
	SSL_SSLV3,
784
	SSL_NOT_EXP|SSL_MEDIUM,
785
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
786 787 788 789
	128,
	128,
	},

790
/* Cipher 26 */
791 792
	{
	1,
793 794
	SSL3_TXT_KRB5_DES_40_CBC_SHA,
	SSL3_CK_KRB5_DES_40_CBC_SHA,
795 796 797 798
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_DES,
	SSL_SHA1,
799
	SSL_SSLV3,
800
	SSL_EXPORT|SSL_EXP40,
801
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
802 803 804 805
	40,
	56,
	},

806
/* Cipher 27 */
807 808 809 810
	{
	1,
	SSL3_TXT_KRB5_RC2_40_CBC_SHA,
	SSL3_CK_KRB5_RC2_40_CBC_SHA,
811 812 813 814 815
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_RC2,
	SSL_SHA1,
	SSL_SSLV3,
816
	SSL_EXPORT|SSL_EXP40,
817
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
818 819 820 821
	40,
	128,
	},

822
/* Cipher 28 */
823 824
	{
	1,
R
Typos.  
Richard Levitte 已提交
825 826
	SSL3_TXT_KRB5_RC4_40_SHA,
	SSL3_CK_KRB5_RC4_40_SHA,
827 828 829 830 831
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_RC4,
	SSL_SHA1,
	SSL_SSLV3,
832
	SSL_EXPORT|SSL_EXP40,
833
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
834
	40,
835 836 837
	128,
	},

838
/* Cipher 29 */
839 840 841 842
	{
	1,
	SSL3_TXT_KRB5_DES_40_CBC_MD5,
	SSL3_CK_KRB5_DES_40_CBC_MD5,
843 844 845 846 847
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_DES,
	SSL_MD5,
	SSL_SSLV3,
848
	SSL_EXPORT|SSL_EXP40,
849
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
850 851 852 853
	40,
	56,
	},

854
/* Cipher 2A */
855 856 857 858
	{
	1,
	SSL3_TXT_KRB5_RC2_40_CBC_MD5,
	SSL3_CK_KRB5_RC2_40_CBC_MD5,
859 860 861 862 863
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_RC2,
	SSL_MD5,
	SSL_SSLV3,
864
	SSL_EXPORT|SSL_EXP40,
865
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
866 867 868 869
	40,
	128,
	},

870
/* Cipher 2B */
871 872
	{
	1,
R
Typos.  
Richard Levitte 已提交
873 874
	SSL3_TXT_KRB5_RC4_40_MD5,
	SSL3_CK_KRB5_RC4_40_MD5,
875 876 877 878 879
	SSL_kKRB5,
	SSL_aKRB5,
	SSL_RC4,
	SSL_MD5,
	SSL_SSLV3,
880
	SSL_EXPORT|SSL_EXP40,
881
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
882
	40,
883
	128,
884
	},
885
#endif	/* OPENSSL_NO_KRB5 */
D
 
Dr. Stephen Henson 已提交
886

887
/* New AES ciphersuites */
888 889 890 891 892
/* Cipher 2F */
	{
	1,
	TLS1_TXT_RSA_WITH_AES_128_SHA,
	TLS1_CK_RSA_WITH_AES_128_SHA,
893 894 895 896 897
	SSL_kRSA,
	SSL_aRSA,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
898
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
899
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
900 901 902 903 904 905 906 907
	128,
	128,
	},
/* Cipher 30 */
	{
	0,
	TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
	TLS1_CK_DH_DSS_WITH_AES_128_SHA,
908 909 910 911 912
	SSL_kDHd,
	SSL_aDH,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
913
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
914
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
915 916 917 918 919 920 921 922
	128,
	128,
	},
/* Cipher 31 */
	{
	0,
	TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
	TLS1_CK_DH_RSA_WITH_AES_128_SHA,
923 924 925 926 927
	SSL_kDHr,
	SSL_aDH,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
928
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
929
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
930 931 932 933 934 935 936 937
	128,
	128,
	},
/* Cipher 32 */
	{
	1,
	TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,
	TLS1_CK_DHE_DSS_WITH_AES_128_SHA,
938 939 940 941 942
	SSL_kEDH,
	SSL_aDSS,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
943
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
944
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
945 946 947 948 949 950 951 952
	128,
	128,
	},
/* Cipher 33 */
	{
	1,
	TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,
	TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
953 954 955 956 957
	SSL_kEDH,
	SSL_aRSA,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
958
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
959
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
960 961 962 963 964 965 966 967
	128,
	128,
	},
/* Cipher 34 */
	{
	1,
	TLS1_TXT_ADH_WITH_AES_128_SHA,
	TLS1_CK_ADH_WITH_AES_128_SHA,
968 969 970 971 972
	SSL_kEDH,
	SSL_aNULL,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
973
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
974
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
975 976 977
	128,
	128,
	},
D
 
Dr. Stephen Henson 已提交
978

979 980 981 982 983
/* Cipher 35 */
	{
	1,
	TLS1_TXT_RSA_WITH_AES_256_SHA,
	TLS1_CK_RSA_WITH_AES_256_SHA,
984 985 986 987 988
	SSL_kRSA,
	SSL_aRSA,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
989
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
990
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
991 992 993 994 995 996 997 998
	256,
	256,
	},
/* Cipher 36 */
	{
	0,
	TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
	TLS1_CK_DH_DSS_WITH_AES_256_SHA,
999 1000 1001 1002 1003
	SSL_kDHd,
	SSL_aDH,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
1004
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1005
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1006 1007 1008
	256,
	256,
	},
1009

1010 1011
/* Cipher 37 */
	{
1012
	0, /* not implemented (non-ephemeral DH) */
1013 1014
	TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
	TLS1_CK_DH_RSA_WITH_AES_256_SHA,
1015 1016 1017 1018 1019
	SSL_kDHr,
	SSL_aDH,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
1020
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1021
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1022 1023 1024
	256,
	256,
	},
1025

1026 1027 1028 1029 1030
/* Cipher 38 */
	{
	1,
	TLS1_TXT_DHE_DSS_WITH_AES_256_SHA,
	TLS1_CK_DHE_DSS_WITH_AES_256_SHA,
1031 1032 1033 1034 1035
	SSL_kEDH,
	SSL_aDSS,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
1036
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1037
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1038 1039 1040
	256,
	256,
	},
1041

1042 1043 1044 1045 1046
/* Cipher 39 */
	{
	1,
	TLS1_TXT_DHE_RSA_WITH_AES_256_SHA,
	TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
1047 1048 1049 1050 1051
	SSL_kEDH,
	SSL_aRSA,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
1052
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1053
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1054 1055 1056
	256,
	256,
	},
1057

D
 
Dr. Stephen Henson 已提交
1058
	/* Cipher 3A */
1059 1060 1061 1062
	{
	1,
	TLS1_TXT_ADH_WITH_AES_256_SHA,
	TLS1_CK_ADH_WITH_AES_256_SHA,
1063 1064 1065 1066 1067
	SSL_kEDH,
	SSL_aNULL,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
1068
	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
1069
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1070 1071 1072
	256,
	256,
	},
B
Bodo Möller 已提交
1073

1074 1075 1076 1077 1078 1079 1080 1081
#ifndef OPENSSL_NO_CAMELLIA
	/* Camellia ciphersuites from RFC4132 (128-bit portion) */

	/* Cipher 41 */
	{
	1,
	TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA,
	TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA,
1082 1083 1084 1085 1086
	SSL_kRSA,
	SSL_aRSA,
	SSL_CAMELLIA128,
	SSL_SHA1,
	SSL_TLSV1,
1087
	SSL_NOT_EXP|SSL_HIGH,
1088
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1089 1090 1091
	128,
	128,
	},
1092

1093 1094 1095 1096 1097
	/* Cipher 42 */
	{
	0, /* not implemented (non-ephemeral DH) */
	TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
	TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
1098 1099 1100 1101 1102
	SSL_kDHd,
	SSL_aDH,
	SSL_CAMELLIA128,
	SSL_SHA1,
	SSL_TLSV1,
1103
	SSL_NOT_EXP|SSL_HIGH,
1104
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1105 1106 1107
	128,
	128,
	},
1108

1109 1110 1111 1112 1113
	/* Cipher 43 */
	{
	0, /* not implemented (non-ephemeral DH) */
	TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
	TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
1114 1115 1116 1117 1118
	SSL_kDHr,
	SSL_aDH,
	SSL_CAMELLIA128,
	SSL_SHA1,
	SSL_TLSV1,
1119
	SSL_NOT_EXP|SSL_HIGH,
1120
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1121 1122 1123
	128,
	128,
	},
1124

1125 1126 1127 1128 1129
	/* Cipher 44 */
	{
	1,
	TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
	TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
1130 1131 1132 1133 1134
	SSL_kEDH,
	SSL_aDSS,
	SSL_CAMELLIA128,
	SSL_SHA1,
	SSL_TLSV1,
1135
	SSL_NOT_EXP|SSL_HIGH,
1136
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1137 1138 1139
	128,
	128,
	},
1140

1141 1142 1143 1144 1145
	/* Cipher 45 */
	{
	1,
	TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
	TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
1146 1147 1148 1149 1150
	SSL_kEDH,
	SSL_aRSA,
	SSL_CAMELLIA128,
	SSL_SHA1,
	SSL_TLSV1,
1151
	SSL_NOT_EXP|SSL_HIGH,
1152
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1153 1154 1155
	128,
	128,
	},
1156

1157 1158 1159 1160 1161
	/* Cipher 46 */
	{
	1,
	TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA,
	TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA,
1162 1163 1164 1165 1166
	SSL_kEDH,
	SSL_aNULL,
	SSL_CAMELLIA128,
	SSL_SHA1,
	SSL_TLSV1,
1167
	SSL_NOT_EXP|SSL_HIGH,
1168
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1169 1170 1171 1172 1173
	128,
	128,
	},
#endif /* OPENSSL_NO_CAMELLIA */

1174 1175 1176 1177
#if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
	/* New TLS Export CipherSuites from expired ID */
#if 0
	/* Cipher 60 */
1178 1179 1180 1181 1182 1183 1184 1185 1186 1187
	{
	1,
	TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5,
	TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5,
	SSL_kRSA,
	SSL_aRSA,
	SSL_RC4,
	SSL_MD5,
	SSL_TLSV1,
	SSL_EXPORT|SSL_EXP56,
1188
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1189 1190 1191 1192
	56,
	128,
	},

1193
	/* Cipher 61 */
1194 1195 1196 1197 1198 1199 1200 1201 1202 1203
	{
	1,
	TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
	TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
	SSL_kRSA,
	SSL_aRSA,
	SSL_RC2,
	SSL_MD5,
	SSL_TLSV1,
	SSL_EXPORT|SSL_EXP56,
1204
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1205 1206 1207
	56,
	128,
	},
1208
#endif
1209

1210
	/* Cipher 62 */
1211 1212 1213 1214 1215 1216 1217 1218 1219 1220
	{
	1,
	TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
	TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
	SSL_kRSA,
	SSL_aRSA,
	SSL_DES,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_EXPORT|SSL_EXP56,
1221
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1222 1223 1224 1225
	56,
	56,
	},

1226
	/* Cipher 63 */
1227 1228 1229 1230 1231 1232 1233 1234 1235 1236
	{
	1,
	TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
	TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
	SSL_kEDH,
	SSL_aDSS,
	SSL_DES,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_EXPORT|SSL_EXP56,
1237
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1238 1239 1240 1241
	56,
	56,
	},

1242
	/* Cipher 64 */
1243 1244 1245 1246 1247 1248 1249 1250 1251 1252
	{
	1,
	TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
	TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA,
	SSL_kRSA,
	SSL_aRSA,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_EXPORT|SSL_EXP56,
1253
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1254 1255 1256 1257
	56,
	128,
	},

1258
	/* Cipher 65 */
1259 1260 1261 1262 1263 1264 1265 1266 1267 1268
	{
	1,
	TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
	TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
	SSL_kEDH,
	SSL_aDSS,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_EXPORT|SSL_EXP56,
1269
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1270 1271 1272 1273
	56,
	128,
	},

1274
	/* Cipher 66 */
1275 1276 1277 1278 1279 1280 1281 1282 1283 1284
	{
	1,
	TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
	TLS1_CK_DHE_DSS_WITH_RC4_128_SHA,
	SSL_kEDH,
	SSL_aDSS,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_MEDIUM,
1285
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1286 1287 1288
	128,
	128,
	},
1289
#endif
1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345
	{
	1,
	"GOST94-GOST89-GOST89",
	0x3000080,
	SSL_kGOST,
	SSL_aGOST94,
	SSL_eGOST2814789CNT,
	SSL_GOST89MAC,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
	SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|TLS1_STREAM_MAC,
	256,
	256
	},
	{
	1,
	"GOST2001-GOST89-GOST89",
	0x3000081,
	SSL_kGOST,
	SSL_aGOST01,
	SSL_eGOST2814789CNT,
	SSL_GOST89MAC,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
	SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94|TLS1_STREAM_MAC,
	256,
	256
	},
	{
	1,
	"GOST94-NULL-GOST94",
	0x3000082,
	SSL_kGOST,
	SSL_aGOST94,
	SSL_eNULL,
	SSL_GOST94,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_STRONG_NONE,
	SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
	0,
	0
	},
	{
	1,
	"GOST2001-NULL-GOST94",
	0x3000083,
	SSL_kGOST,
	SSL_aGOST01,
	SSL_eNULL,
	SSL_GOST94,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_STRONG_NONE,
	SSL_HANDSHAKE_MAC_GOST94|TLS1_PRF_GOST94,
	0,
	0
	},
1346 1347 1348 1349 1350 1351 1352 1353 1354

#ifndef OPENSSL_NO_CAMELLIA
	/* Camellia ciphersuites from RFC4132 (256-bit portion) */

	/* Cipher 84 */
	{
	1,
	TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA,
	TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA,
1355 1356 1357 1358 1359
	SSL_kRSA,
	SSL_aRSA,
	SSL_CAMELLIA256,
	SSL_SHA1,
	SSL_TLSV1,
1360
	SSL_NOT_EXP|SSL_HIGH,
1361
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1362 1363 1364 1365 1366 1367 1368 1369
	256,
	256,
	},
	/* Cipher 85 */
	{
	0, /* not implemented (non-ephemeral DH) */
	TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
	TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
1370 1371 1372 1373 1374
	SSL_kDHd,
	SSL_aDH,
	SSL_CAMELLIA256,
	SSL_SHA1,
	SSL_TLSV1,
1375
	SSL_NOT_EXP|SSL_HIGH,
1376
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1377 1378 1379
	256,
	256,
	},
1380

1381 1382 1383 1384 1385
	/* Cipher 86 */
	{
	0, /* not implemented (non-ephemeral DH) */
	TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
	TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
1386 1387 1388 1389 1390
	SSL_kDHr,
	SSL_aDH,
	SSL_CAMELLIA256,
	SSL_SHA1,
	SSL_TLSV1,
1391
	SSL_NOT_EXP|SSL_HIGH,
1392
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1393 1394 1395
	256,
	256,
	},
1396

1397 1398 1399 1400 1401
	/* Cipher 87 */
	{
	1,
	TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
	TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
1402 1403 1404 1405 1406
	SSL_kEDH,
	SSL_aDSS,
	SSL_CAMELLIA256,
	SSL_SHA1,
	SSL_TLSV1,
1407
	SSL_NOT_EXP|SSL_HIGH,
1408
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1409 1410 1411
	256,
	256,
	},
1412

1413 1414 1415 1416 1417
	/* Cipher 88 */
	{
	1,
	TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
	TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
1418 1419 1420 1421 1422
	SSL_kEDH,
	SSL_aRSA,
	SSL_CAMELLIA256,
	SSL_SHA1,
	SSL_TLSV1,
1423
	SSL_NOT_EXP|SSL_HIGH,
1424
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1425 1426 1427
	256,
	256,
	},
1428

1429 1430 1431 1432 1433
	/* Cipher 89 */
	{
	1,
	TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA,
	TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA,
1434 1435 1436 1437 1438
	SSL_kEDH,
	SSL_aNULL,
	SSL_CAMELLIA256,
	SSL_SHA1,
	SSL_TLSV1,
1439
	SSL_NOT_EXP|SSL_HIGH,
1440
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1441 1442 1443 1444 1445
	256,
	256,
	},
#endif /* OPENSSL_NO_CAMELLIA */

1446 1447 1448 1449 1450 1451
#ifndef OPENSSL_NO_PSK
	/* Cipher 8A */
	{
	1,
	TLS1_TXT_PSK_WITH_RC4_128_SHA,
	TLS1_CK_PSK_WITH_RC4_128_SHA,
1452 1453 1454 1455 1456
	SSL_kPSK,
	SSL_aPSK,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
1457
	SSL_NOT_EXP|SSL_MEDIUM,
1458
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1459 1460 1461 1462 1463 1464 1465 1466 1467
	128,
	128,
	},

	/* Cipher 8B */
	{
	1,
	TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA,
	TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA,
1468 1469 1470 1471 1472
	SSL_kPSK,
	SSL_aPSK,
	SSL_3DES,
	SSL_SHA1,
	SSL_TLSV1,
1473
	SSL_NOT_EXP|SSL_HIGH,
1474
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1475 1476 1477 1478 1479 1480 1481 1482 1483
	168,
	168,
	},

	/* Cipher 8C */
	{
	1,
	TLS1_TXT_PSK_WITH_AES_128_CBC_SHA,
	TLS1_CK_PSK_WITH_AES_128_CBC_SHA,
1484 1485 1486 1487 1488 1489
	SSL_kPSK,
	SSL_aPSK,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1490
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1491 1492 1493 1494 1495 1496 1497 1498 1499
	128,
	128,
	},

	/* Cipher 8D */
	{
	1,
	TLS1_TXT_PSK_WITH_AES_256_CBC_SHA,
	TLS1_CK_PSK_WITH_AES_256_CBC_SHA,
1500 1501 1502 1503 1504
	SSL_kPSK,
	SSL_aPSK,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
1505
	SSL_NOT_EXP|SSL_HIGH,
1506
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1507 1508 1509 1510
	256,
	256,
	},
#endif  /* OPENSSL_NO_PSK */
1511

B
Bodo Möller 已提交
1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525
#ifndef OPENSSL_NO_SEED
	/* SEED ciphersuites from RFC4162 */

	/* Cipher 96 */
	{
	1,
	TLS1_TXT_RSA_WITH_SEED_SHA,
	TLS1_CK_RSA_WITH_SEED_SHA,
	SSL_kRSA,
	SSL_aRSA,
	SSL_SEED,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_MEDIUM,
1526
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
B
Bodo Möller 已提交
1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541
	128,
	128,
	},

	/* Cipher 97 */
	{
	0, /* not implemented (non-ephemeral DH) */
	TLS1_TXT_DH_DSS_WITH_SEED_SHA,
	TLS1_CK_DH_DSS_WITH_SEED_SHA,
	SSL_kDHd,
	SSL_aDH,
	SSL_SEED,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_MEDIUM,
1542
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
B
Bodo Möller 已提交
1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557
	128,
	128,
	},

	/* Cipher 98 */
	{
	0, /* not implemented (non-ephemeral DH) */
	TLS1_TXT_DH_RSA_WITH_SEED_SHA,
	TLS1_CK_DH_RSA_WITH_SEED_SHA,
	SSL_kDHr,
	SSL_aDH,
	SSL_SEED,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_MEDIUM,
1558
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
B
Bodo Möller 已提交
1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573
	128,
	128,
	},

	/* Cipher 99 */
	{
	1,
	TLS1_TXT_DHE_DSS_WITH_SEED_SHA,
	TLS1_CK_DHE_DSS_WITH_SEED_SHA,
	SSL_kEDH,
	SSL_aDSS,
	SSL_SEED,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_MEDIUM,
1574
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
B
Bodo Möller 已提交
1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589
	128,
	128,
	},

	/* Cipher 9A */
	{
	1,
	TLS1_TXT_DHE_RSA_WITH_SEED_SHA,
	TLS1_CK_DHE_RSA_WITH_SEED_SHA,
	SSL_kEDH,
	SSL_aRSA,
	SSL_SEED,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_MEDIUM,
1590
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
B
Bodo Möller 已提交
1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605
	128,
	128,
	},

	/* Cipher 9B */
	{
	1,
	TLS1_TXT_ADH_WITH_SEED_SHA,
	TLS1_CK_ADH_WITH_SEED_SHA,
	SSL_kEDH,
	SSL_aNULL,
	SSL_SEED,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_MEDIUM,
1606
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
B
Bodo Möller 已提交
1607 1608 1609 1610 1611 1612
	128,
	128,
	},

#endif /* OPENSSL_NO_SEED */

B
Bodo Möller 已提交
1613
#ifndef OPENSSL_NO_ECDH
B
Bodo Möller 已提交
1614
	/* Cipher C001 */
1615 1616 1617 1618 1619 1620 1621 1622 1623
	{
	1,
	TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA,
	TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA,
	SSL_kECDHe,
	SSL_aECDH,
	SSL_eNULL,
	SSL_SHA1,
	SSL_TLSV1,
1624
	SSL_NOT_EXP|SSL_STRONG_NONE,
1625
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1626 1627 1628
	0,
	0,
	},
B
Bodo Möller 已提交
1629

B
Bodo Möller 已提交
1630
	/* Cipher C002 */
1631 1632 1633 1634 1635 1636 1637 1638 1639
	{
	1,
	TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA,
	TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA,
	SSL_kECDHe,
	SSL_aECDH,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
1640
	SSL_NOT_EXP|SSL_MEDIUM,
1641
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1642 1643 1644
	128,
	128,
	},
B
Bodo Möller 已提交
1645

B
Bodo Möller 已提交
1646
	/* Cipher C003 */
1647 1648 1649 1650 1651 1652 1653 1654 1655 1656
	{
	1,
	TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA,
	TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA,
	SSL_kECDHe,
	SSL_aECDH,
	SSL_3DES,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1657
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1658 1659 1660
	168,
	168,
	},
B
Bodo Möller 已提交
1661

B
Bodo Möller 已提交
1662
	/* Cipher C004 */
1663 1664 1665 1666 1667 1668 1669 1670 1671 1672
	{
	1,
	TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
	TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
	SSL_kECDHe,
	SSL_aECDH,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1673
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1674 1675 1676
	128,
	128,
	},
B
Bodo Möller 已提交
1677

B
Bodo Möller 已提交
1678
	/* Cipher C005 */
1679 1680 1681 1682 1683 1684 1685 1686 1687 1688
	{
	1,
	TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
	TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
	SSL_kECDHe,
	SSL_aECDH,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1689
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1690 1691 1692
	256,
	256,
	},
B
Bodo Möller 已提交
1693

B
Bodo Möller 已提交
1694
	/* Cipher C006 */
1695 1696 1697 1698 1699 1700 1701 1702 1703
	{
	1,
	TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA,
	TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA,
	SSL_kEECDH,
	SSL_aECDSA,
	SSL_eNULL,
	SSL_SHA1,
	SSL_TLSV1,
1704
	SSL_NOT_EXP|SSL_STRONG_NONE,
1705
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1706 1707 1708
	0,
	0,
	},
B
Bodo Möller 已提交
1709

B
Bodo Möller 已提交
1710
	/* Cipher C007 */
1711 1712 1713 1714 1715 1716 1717 1718 1719
	{
	1,
	TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA,
	TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA,
	SSL_kEECDH,
	SSL_aECDSA,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
1720
	SSL_NOT_EXP|SSL_MEDIUM,
1721
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1722 1723 1724
	128,
	128,
	},
B
Bodo Möller 已提交
1725

B
Bodo Möller 已提交
1726
	/* Cipher C008 */
1727 1728 1729 1730 1731 1732 1733 1734 1735 1736
	{
	1,
	TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
	TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
	SSL_kEECDH,
	SSL_aECDSA,
	SSL_3DES,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1737
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1738 1739 1740
	168,
	168,
	},
B
Bodo Möller 已提交
1741 1742

	/* Cipher C009 */
1743 1744 1745 1746 1747 1748 1749 1750 1751 1752
	{
	1,
	TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
	TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
	SSL_kEECDH,
	SSL_aECDSA,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1753
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1754 1755 1756
	128,
	128,
	},
B
Bodo Möller 已提交
1757 1758

	/* Cipher C00A */
1759 1760 1761 1762 1763 1764 1765 1766 1767 1768
	{
	1,
	TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
	TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
	SSL_kEECDH,
	SSL_aECDSA,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1769
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1770 1771 1772
	256,
	256,
	},
B
Bodo Möller 已提交
1773 1774

	/* Cipher C00B */
1775 1776 1777 1778 1779 1780 1781 1782 1783
	{
	1,
	TLS1_TXT_ECDH_RSA_WITH_NULL_SHA,
	TLS1_CK_ECDH_RSA_WITH_NULL_SHA,
	SSL_kECDHr,
	SSL_aECDH,
	SSL_eNULL,
	SSL_SHA1,
	SSL_TLSV1,
1784
	SSL_NOT_EXP|SSL_STRONG_NONE,
1785
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1786 1787 1788
	0,
	0,
	},
B
Bodo Möller 已提交
1789

B
Bodo Möller 已提交
1790
	/* Cipher C00C */
1791 1792 1793 1794 1795 1796 1797 1798 1799
	{
	1,
	TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA,
	TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA,
	SSL_kECDHr,
	SSL_aECDH,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
1800
	SSL_NOT_EXP|SSL_MEDIUM,
1801
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1802 1803 1804
	128,
	128,
	},
B
Bodo Möller 已提交
1805 1806

	/* Cipher C00D */
1807 1808 1809 1810 1811 1812 1813 1814 1815 1816
	{
	1,
	TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA,
	TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA,
	SSL_kECDHr,
	SSL_aECDH,
	SSL_3DES,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1817
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1818 1819 1820
	168,
	168,
	},
B
Bodo Möller 已提交
1821

B
Bodo Möller 已提交
1822
	/* Cipher C00E */
1823 1824 1825 1826 1827 1828 1829 1830 1831 1832
	{
	1,
	TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA,
	TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA,
	SSL_kECDHr,
	SSL_aECDH,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1833
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1834 1835 1836
	128,
	128,
	},
B
Bodo Möller 已提交
1837

B
Bodo Möller 已提交
1838
	/* Cipher C00F */
1839 1840 1841 1842 1843 1844 1845 1846 1847 1848
	{
	1,
	TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA,
	TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA,
	SSL_kECDHr,
	SSL_aECDH,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1849
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1850 1851 1852
	256,
	256,
	},
B
Bodo Möller 已提交
1853

B
Bodo Möller 已提交
1854
	/* Cipher C010 */
1855 1856 1857 1858 1859 1860 1861 1862 1863
	{
	1,
	TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA,
	TLS1_CK_ECDHE_RSA_WITH_NULL_SHA,
	SSL_kEECDH,
	SSL_aRSA,
	SSL_eNULL,
	SSL_SHA1,
	SSL_TLSV1,
1864
	SSL_NOT_EXP|SSL_STRONG_NONE,
1865
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1866 1867 1868
	0,
	0,
	},
B
Bodo Möller 已提交
1869 1870

	/* Cipher C011 */
1871 1872 1873 1874 1875 1876 1877 1878 1879
	{
	1,
	TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA,
	TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA,
	SSL_kEECDH,
	SSL_aRSA,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
1880
	SSL_NOT_EXP|SSL_MEDIUM,
1881
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1882 1883 1884
	128,
	128,
	},
B
Bodo Möller 已提交
1885

B
Bodo Möller 已提交
1886
	/* Cipher C012 */
1887 1888 1889 1890 1891 1892 1893 1894 1895 1896
	{
	1,
	TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
	TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
	SSL_kEECDH,
	SSL_aRSA,
	SSL_3DES,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1897
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1898 1899 1900
	168,
	168,
	},
B
Bodo Möller 已提交
1901 1902

	/* Cipher C013 */
1903 1904 1905 1906 1907 1908 1909 1910 1911 1912
	{
	1,
	TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA,
	TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA,
	SSL_kEECDH,
	SSL_aRSA,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1913
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1914 1915 1916
	128,
	128,
	},
B
Bodo Möller 已提交
1917

B
Bodo Möller 已提交
1918
	/* Cipher C014 */
1919 1920 1921 1922 1923 1924 1925 1926 1927 1928
	{
	1,
	TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA,
	TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA,
	SSL_kEECDH,
	SSL_aRSA,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1929
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1930 1931 1932
	256,
	256,
	},
B
Bodo Möller 已提交
1933 1934

	/* Cipher C015 */
1935 1936 1937 1938 1939 1940 1941 1942 1943
	{
	1,
	TLS1_TXT_ECDH_anon_WITH_NULL_SHA,
	TLS1_CK_ECDH_anon_WITH_NULL_SHA,
	SSL_kEECDH,
	SSL_aNULL,
	SSL_eNULL,
	SSL_SHA1,
	SSL_TLSV1,
1944
	SSL_NOT_EXP|SSL_STRONG_NONE,
1945
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1946 1947 1948
	0,
	0,
	},
B
Bodo Möller 已提交
1949

B
Bodo Möller 已提交
1950
	/* Cipher C016 */
1951 1952 1953 1954 1955 1956 1957 1958 1959
	{
	1,
	TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA,
	TLS1_CK_ECDH_anon_WITH_RC4_128_SHA,
	SSL_kEECDH,
	SSL_aNULL,
	SSL_RC4,
	SSL_SHA1,
	SSL_TLSV1,
1960
	SSL_NOT_EXP|SSL_MEDIUM,
1961
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1962 1963 1964
	128,
	128,
	},
B
Bodo Möller 已提交
1965

B
Bodo Möller 已提交
1966
	/* Cipher C017 */
1967 1968 1969 1970 1971 1972 1973 1974 1975 1976
	{
	1,
	TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA,
	TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA,
	SSL_kEECDH,
	SSL_aNULL,
	SSL_3DES,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1977
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1978 1979 1980
	168,
	168,
	},
B
Bodo Möller 已提交
1981

B
Bodo Möller 已提交
1982
	/* Cipher C018 */
1983 1984 1985 1986 1987 1988 1989 1990 1991 1992
	{
	1,
	TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA,
	TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA,
	SSL_kEECDH,
	SSL_aNULL,
	SSL_AES128,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
1993
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
1994 1995 1996
	128,
	128,
	},
1997

B
Bodo Möller 已提交
1998
	/* Cipher C019 */
1999 2000 2001 2002 2003 2004 2005 2006 2007 2008
	{
	1,
	TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA,
	TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA,
	SSL_kEECDH,
	SSL_aNULL,
	SSL_AES256,
	SSL_SHA1,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
2009
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
2010 2011 2012
	256,
	256,
	},
2013 2014
#endif	/* OPENSSL_NO_ECDH */

2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026
#ifdef TEMP_GOST_TLS
/* Cipher FF00 */
	{
	1,
	"GOST-MD5",
	0x0300ff00,
	SSL_kRSA,
	SSL_aRSA,
	SSL_eGOST2814789CNT,
	SSL_MD5,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
2027
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
2028 2029 2030
	256,
	256,
	},
2031 2032 2033 2034 2035 2036 2037 2038 2039 2040
	{
	1,
	"GOST-GOST94",
	0x0300ff01,
	SSL_kRSA,
	SSL_aRSA,
	SSL_eGOST2814789CNT,
	SSL_GOST94,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
2041
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054
	256,
	256
	},
	{
	1,
	"GOST-GOST89MAC",
	0x0300ff02,
	SSL_kRSA,
	SSL_aRSA,
	SSL_eGOST2814789CNT,
	SSL_GOST89MAC,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
2055
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068
	256,
	256
	},
	{
	1,
	"GOST-GOST89STREAM",
	0x0300ff03,
	SSL_kRSA,
	SSL_aRSA,
	SSL_eGOST2814789CNT,
	SSL_GOST89MAC,
	SSL_TLSV1,
	SSL_NOT_EXP|SSL_HIGH,
2069
	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF|TLS1_STREAM_MAC,
2070 2071 2072
	256,
	256
	},
2073 2074
#endif

2075 2076 2077
/* end of list */
	};

2078
SSL3_ENC_METHOD SSLv3_enc_data={
2079
	ssl3_enc,
2080
	n_ssl3_mac,
2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091
	ssl3_setup_key_block,
	ssl3_generate_master_secret,
	ssl3_change_cipher_state,
	ssl3_final_finish_mac,
	MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
	ssl3_cert_verify_mac,
	SSL3_MD_CLIENT_FINISHED_CONST,4,
	SSL3_MD_SERVER_FINISHED_CONST,4,
	ssl3_alert_code,
	};

2092
long ssl3_default_timeout(void)
2093 2094 2095 2096 2097 2098
	{
	/* 2 hours, the 24 hours mentioned in the SSLv3 spec
	 * is way too long for http, the cache would over fill */
	return(60*60*2);
	}

U
Ulf Möller 已提交
2099
int ssl3_num_ciphers(void)
2100 2101 2102 2103
	{
	return(SSL3_NUM_CIPHERS);
	}

2104
const SSL_CIPHER *ssl3_get_cipher(unsigned int u)
2105 2106 2107 2108 2109 2110 2111
	{
	if (u < SSL3_NUM_CIPHERS)
		return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u]));
	else
		return(NULL);
	}

B
Ben Laurie 已提交
2112
int ssl3_pending(const SSL *s)
2113
	{
B
Bodo Möller 已提交
2114 2115 2116
	if (s->rstate == SSL_ST_READ_BODY)
		return 0;
	
B
Bodo Möller 已提交
2117
	return (s->s3->rrec.type == SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
2118 2119
	}

U
Ulf Möller 已提交
2120
int ssl3_new(SSL *s)
2121
	{
2122
	SSL3_STATE *s3;
2123

2124
	if ((s3=OPENSSL_malloc(sizeof *s3)) == NULL) goto err;
2125
	memset(s3,0,sizeof *s3);
2126 2127
	memset(s3->rrec.seq_num,0,sizeof(s3->rrec.seq_num));
	memset(s3->wrec.seq_num,0,sizeof(s3->wrec.seq_num));
2128 2129 2130

	s->s3=s3;

2131
	s->method->ssl_clear(s);
2132 2133 2134 2135 2136
	return(1);
err:
	return(0);
	}

U
Ulf Möller 已提交
2137
void ssl3_free(SSL *s)
2138
	{
B
Ben Laurie 已提交
2139 2140 2141
	if(s == NULL)
	    return;

2142 2143 2144 2145 2146 2147 2148
#ifdef TLSEXT_TYPE_opaque_prf_input
	if (s->s3->client_opaque_prf_input != NULL)
		OPENSSL_free(s->s3->client_opaque_prf_input);
	if (s->s3->server_opaque_prf_input != NULL)
		OPENSSL_free(s->s3->server_opaque_prf_input);
#endif

2149 2150
	ssl3_cleanup_key_block(s);
	if (s->s3->rbuf.buf != NULL)
B
Ben Laurie 已提交
2151
		ssl3_release_read_buffer(s);
2152
	if (s->s3->wbuf.buf != NULL)
B
Ben Laurie 已提交
2153
		ssl3_release_write_buffer(s);
2154
	if (s->s3->rrec.comp != NULL)
2155
		OPENSSL_free(s->s3->rrec.comp);
2156
#ifndef OPENSSL_NO_DH
2157 2158 2159
	if (s->s3->tmp.dh != NULL)
		DH_free(s->s3->tmp.dh);
#endif
B
Bodo Möller 已提交
2160 2161 2162 2163 2164
#ifndef OPENSSL_NO_ECDH
	if (s->s3->tmp.ecdh != NULL)
		EC_KEY_free(s->s3->tmp.ecdh);
#endif

2165
	if (s->s3->tmp.ca_names != NULL)
B
Ben Laurie 已提交
2166
		sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
2167 2168 2169 2170
	if (s->s3->handshake_buffer) {
		BIO_free(s->s3->handshake_buffer);
	}
	if (s->s3->handshake_dgst) ssl3_free_digest_list(s);
2171
	OPENSSL_cleanse(s->s3,sizeof *s->s3);
2172
	OPENSSL_free(s->s3);
2173 2174 2175
	s->s3=NULL;
	}

U
Ulf Möller 已提交
2176
void ssl3_clear(SSL *s)
2177 2178
	{
	unsigned char *rp,*wp;
2179
	size_t rlen, wlen;
2180

2181 2182 2183 2184 2185 2186 2187 2188 2189
#ifdef TLSEXT_TYPE_opaque_prf_input
	if (s->s3->client_opaque_prf_input != NULL)
		OPENSSL_free(s->s3->client_opaque_prf_input);
	s->s3->client_opaque_prf_input = NULL;
	if (s->s3->server_opaque_prf_input != NULL)
		OPENSSL_free(s->s3->server_opaque_prf_input);
	s->s3->server_opaque_prf_input = NULL;
#endif

2190 2191
	ssl3_cleanup_key_block(s);
	if (s->s3->tmp.ca_names != NULL)
B
Ben Laurie 已提交
2192
		sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
2193

2194 2195
	if (s->s3->rrec.comp != NULL)
		{
2196
		OPENSSL_free(s->s3->rrec.comp);
2197 2198
		s->s3->rrec.comp=NULL;
		}
2199
#ifndef OPENSSL_NO_DH
B
Bodo Möller 已提交
2200 2201 2202
	if (s->s3->tmp.dh != NULL)
		DH_free(s->s3->tmp.dh);
#endif
B
Bodo Möller 已提交
2203 2204 2205 2206
#ifndef OPENSSL_NO_ECDH
	if (s->s3->tmp.ecdh != NULL)
		EC_KEY_free(s->s3->tmp.ecdh);
#endif
2207

2208 2209 2210 2211
	rp = s->s3->rbuf.buf;
	wp = s->s3->wbuf.buf;
	rlen = s->s3->rbuf.len;
 	wlen = s->s3->wbuf.len;
2212 2213
	if (s->s3->handshake_buffer) {
		BIO_free(s->s3->handshake_buffer);
D
Dr. Stephen Henson 已提交
2214
		s->s3->handshake_buffer = NULL;
2215 2216 2217 2218
	}
	if (s->s3->handshake_dgst) {
		ssl3_free_digest_list(s);
	}	
2219
	memset(s->s3,0,sizeof *s->s3);
2220 2221 2222 2223
	s->s3->rbuf.buf = rp;
	s->s3->wbuf.buf = wp;
	s->s3->rbuf.len = rlen;
 	s->s3->wbuf.len = wlen;
2224

2225
	ssl_free_wbio_buffer(s);
2226

2227
	s->packet_length=0;
2228 2229 2230 2231 2232
	s->s3->renegotiate=0;
	s->s3->total_renegotiations=0;
	s->s3->num_renegotiations=0;
	s->s3->in_read_app_data=0;
	s->version=SSL3_VERSION;
2233 2234
	}

2235
long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
2236
	{
2237 2238
	int ret=0;

2239
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
2240
	if (
2241
#ifndef OPENSSL_NO_RSA
2242 2243 2244
	    cmd == SSL_CTRL_SET_TMP_RSA ||
	    cmd == SSL_CTRL_SET_TMP_RSA_CB ||
#endif
2245
#ifndef OPENSSL_NO_DSA
2246 2247 2248 2249 2250
	    cmd == SSL_CTRL_SET_TMP_DH ||
	    cmd == SSL_CTRL_SET_TMP_DH_CB ||
#endif
		0)
		{
2251
		if (!ssl_cert_inst(&s->cert))
2252 2253 2254 2255 2256 2257 2258
		    	{
			SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
			return(0);
			}
		}
#endif

2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275
	switch (cmd)
		{
	case SSL_CTRL_GET_SESSION_REUSED:
		ret=s->hit;
		break;
	case SSL_CTRL_GET_CLIENT_CERT_REQUEST:
		break;
	case SSL_CTRL_GET_NUM_RENEGOTIATIONS:
		ret=s->s3->num_renegotiations;
		break;
	case SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS:
		ret=s->s3->num_renegotiations;
		s->s3->num_renegotiations=0;
		break;
	case SSL_CTRL_GET_TOTAL_RENEGOTIATIONS:
		ret=s->s3->total_renegotiations;
		break;
2276
	case SSL_CTRL_GET_FLAGS:
2277
		ret=(int)(s->s3->flags);
2278
		break;
2279
#ifndef OPENSSL_NO_RSA
2280 2281 2282 2283 2284 2285 2286 2287 2288
	case SSL_CTRL_NEED_TMP_RSA:
		if ((s->cert != NULL) && (s->cert->rsa_tmp == NULL) &&
		    ((s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) ||
		     (EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) > (512/8))))
			ret = 1;
		break;
	case SSL_CTRL_SET_TMP_RSA:
		{
			RSA *rsa = (RSA *)parg;
2289 2290
			if (rsa == NULL)
				{
2291 2292
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
				return(ret);
2293 2294 2295
				}
			if ((rsa = RSAPrivateKey_dup(rsa)) == NULL)
				{
2296 2297
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB);
				return(ret);
2298
				}
2299 2300 2301 2302 2303 2304 2305
			if (s->cert->rsa_tmp != NULL)
				RSA_free(s->cert->rsa_tmp);
			s->cert->rsa_tmp = rsa;
			ret = 1;
		}
		break;
	case SSL_CTRL_SET_TMP_RSA_CB:
2306
		{
2307 2308
		SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(ret);
2309
		}
2310 2311
		break;
#endif
2312
#ifndef OPENSSL_NO_DH
2313 2314 2315
	case SSL_CTRL_SET_TMP_DH:
		{
			DH *dh = (DH *)parg;
2316 2317
			if (dh == NULL)
				{
2318 2319
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
				return(ret);
2320 2321 2322
				}
			if ((dh = DHparams_dup(dh)) == NULL)
				{
2323 2324
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB);
				return(ret);
2325 2326 2327 2328 2329 2330 2331 2332 2333 2334
				}
			if (!(s->options & SSL_OP_SINGLE_DH_USE))
				{
				if (!DH_generate_key(dh))
					{
					DH_free(dh);
					SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB);
					return(ret);
					}
				}
2335 2336 2337 2338 2339 2340 2341
			if (s->cert->dh_tmp != NULL)
				DH_free(s->cert->dh_tmp);
			s->cert->dh_tmp = dh;
			ret = 1;
		}
		break;
	case SSL_CTRL_SET_TMP_DH_CB:
2342
		{
2343 2344 2345 2346 2347
		SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(ret);
		}
		break;
#endif
B
Bodo Möller 已提交
2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385
#ifndef OPENSSL_NO_ECDH
	case SSL_CTRL_SET_TMP_ECDH:
		{
		EC_KEY *ecdh = NULL;
 			
		if (parg == NULL)
			{
			SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
			return(ret);
			}
		if (!EC_KEY_up_ref((EC_KEY *)parg))
			{
			SSLerr(SSL_F_SSL3_CTRL,ERR_R_ECDH_LIB);
			return(ret);
			}
		ecdh = (EC_KEY *)parg;
		if (!(s->options & SSL_OP_SINGLE_ECDH_USE))
			{
			if (!EC_KEY_generate_key(ecdh))
				{
				EC_KEY_free(ecdh);
				SSLerr(SSL_F_SSL3_CTRL,ERR_R_ECDH_LIB);
				return(ret);
				}
			}
		if (s->cert->ecdh_tmp != NULL)
			EC_KEY_free(s->cert->ecdh_tmp);
		s->cert->ecdh_tmp = ecdh;
		ret = 1;
		}
		break;
	case SSL_CTRL_SET_TMP_ECDH_CB:
		{
		SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(ret);
		}
		break;
#endif /* !OPENSSL_NO_ECDH */
2386 2387
#ifndef OPENSSL_NO_TLSEXT
	case SSL_CTRL_SET_TLSEXT_HOSTNAME:
2388 2389
 		if (larg == TLSEXT_NAMETYPE_host_name)
			{
2390 2391 2392 2393 2394 2395 2396
			if (s->tlsext_hostname != NULL) 
				OPENSSL_free(s->tlsext_hostname);
			s->tlsext_hostname = NULL;

			ret = 1;
			if (parg == NULL) 
				break;
B
Bodo Möller 已提交
2397
			if (strlen((char *)parg) > TLSEXT_MAXLEN_host_name)
2398
				{
2399 2400
				SSLerr(SSL_F_SSL3_CTRL, SSL_R_SSL3_EXT_INVALID_SERVERNAME);
				return 0;
2401 2402 2403
				}
			if ((s->tlsext_hostname = BUF_strdup((char *)parg)) == NULL)
				{
2404 2405
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_INTERNAL_ERROR);
				return 0;
2406
				}
2407
			}
2408 2409
		else
			{
2410 2411
			SSLerr(SSL_F_SSL3_CTRL, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE);
			return 0;
2412
			}
2413
 		break;
2414 2415
	case SSL_CTRL_SET_TLSEXT_DEBUG_ARG:
		s->tlsext_debug_arg=parg;
2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428
		ret = 1;
		break;

#ifdef TLSEXT_TYPE_opaque_prf_input
	case SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT:
		if (larg > 12288) /* actual internal limit is 2^16 for the complete hello message
		                   * (including the cert chain and everything) */
			{
			SSLerr(SSL_F_SSL3_CTRL, SSL_R_OPAQUE_PRF_INPUT_TOO_LONG);
			break;
			}
		if (s->tlsext_opaque_prf_input != NULL)
			OPENSSL_free(s->tlsext_opaque_prf_input);
2429 2430 2431 2432
		if ((size_t)larg == 0)
			s->tlsext_opaque_prf_input = OPENSSL_malloc(1); /* dummy byte just to get non-NULL */
		else
			s->tlsext_opaque_prf_input = BUF_memdup(parg, (size_t)larg);
2433 2434 2435 2436 2437 2438 2439
		if (s->tlsext_opaque_prf_input != NULL)
			{
			s->tlsext_opaque_prf_input_len = (size_t)larg;
			ret = 1;
			}
		else
			s->tlsext_opaque_prf_input_len = 0;
2440
		break;
2441 2442
#endif

2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479
	case SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE:
		s->tlsext_status_type=larg;
		ret = 1;
		break;

	case SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS:
		*(STACK_OF(X509_EXTENSION) **)parg = s->tlsext_ocsp_exts;
		ret = 1;
		break;

	case SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS:
		s->tlsext_ocsp_exts = parg;
		ret = 1;
		break;

	case SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS:
		*(STACK_OF(OCSP_RESPID) **)parg = s->tlsext_ocsp_ids;
		ret = 1;
		break;

	case SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS:
		s->tlsext_ocsp_ids = parg;
		ret = 1;
		break;

	case SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP:
		*(unsigned char **)parg = s->tlsext_ocsp_resp;
		return s->tlsext_ocsp_resplen;
		
	case SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP:
		if (s->tlsext_ocsp_resp)
			OPENSSL_free(s->tlsext_ocsp_resp);
		s->tlsext_ocsp_resp = parg;
		s->tlsext_ocsp_resplen = larg;
		ret = 1;
		break;

2480
#endif /* !OPENSSL_NO_TLSEXT */
2481 2482 2483 2484 2485
	default:
		break;
		}
	return(ret);
	}
2486

2487
long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void))
2488 2489 2490
	{
	int ret=0;

2491
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
2492
	if (
2493
#ifndef OPENSSL_NO_RSA
2494 2495
	    cmd == SSL_CTRL_SET_TMP_RSA_CB ||
#endif
2496
#ifndef OPENSSL_NO_DSA
2497 2498 2499 2500 2501
	    cmd == SSL_CTRL_SET_TMP_DH_CB ||
#endif
		0)
		{
		if (!ssl_cert_inst(&s->cert))
2502
			{
2503
			SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE);
2504 2505 2506 2507 2508 2509 2510
			return(0);
			}
		}
#endif

	switch (cmd)
		{
2511
#ifndef OPENSSL_NO_RSA
2512 2513 2514 2515 2516 2517
	case SSL_CTRL_SET_TMP_RSA_CB:
		{
		s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))fp;
		}
		break;
#endif
2518
#ifndef OPENSSL_NO_DH
2519 2520 2521
	case SSL_CTRL_SET_TMP_DH_CB:
		{
		s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
2522
		}
2523
		break;
B
Bodo Möller 已提交
2524 2525 2526 2527 2528 2529 2530
#endif
#ifndef OPENSSL_NO_ECDH
	case SSL_CTRL_SET_TMP_ECDH_CB:
		{
		s->cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp;
		}
		break;
2531 2532 2533 2534 2535 2536
#endif
#ifndef OPENSSL_NO_TLSEXT
	case SSL_CTRL_SET_TLSEXT_DEBUG_CB:
		s->tlsext_debug_cb=(void (*)(SSL *,int ,int,
					unsigned char *, int, void *))fp;
		break;
2537
#endif
2538 2539 2540 2541
	default:
		break;
		}
	return(ret);
2542 2543
	}

2544
long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
2545 2546 2547
	{
	CERT *cert;

2548
	cert=ctx->cert;
2549 2550 2551

	switch (cmd)
		{
2552
#ifndef OPENSSL_NO_RSA
2553 2554 2555 2556 2557 2558 2559 2560
	case SSL_CTRL_NEED_TMP_RSA:
		if (	(cert->rsa_tmp == NULL) &&
			((cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL) ||
			 (EVP_PKEY_size(cert->pkeys[SSL_PKEY_RSA_ENC].privatekey) > (512/8)))
			)
			return(1);
		else
			return(0);
2561
		/* break; */
2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588
	case SSL_CTRL_SET_TMP_RSA:
		{
		RSA *rsa;
		int i;

		rsa=(RSA *)parg;
		i=1;
		if (rsa == NULL)
			i=0;
		else
			{
			if ((rsa=RSAPrivateKey_dup(rsa)) == NULL)
				i=0;
			}
		if (!i)
			{
			SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_RSA_LIB);
			return(0);
			}
		else
			{
			if (cert->rsa_tmp != NULL)
				RSA_free(cert->rsa_tmp);
			cert->rsa_tmp=rsa;
			return(1);
			}
		}
2589
		/* break; */
2590
	case SSL_CTRL_SET_TMP_RSA_CB:
2591
		{
2592 2593
		SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(0);
2594
		}
2595 2596
		break;
#endif
2597
#ifndef OPENSSL_NO_DH
2598 2599 2600 2601 2602
	case SSL_CTRL_SET_TMP_DH:
		{
		DH *new=NULL,*dh;

		dh=(DH *)parg;
2603
		if ((new=DHparams_dup(dh)) == NULL)
2604 2605
			{
			SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB);
2606
			return 0;
2607
			}
2608
		if (!(ctx->options & SSL_OP_SINGLE_DH_USE))
2609
			{
2610 2611 2612 2613 2614 2615
			if (!DH_generate_key(new))
				{
				SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB);
				DH_free(new);
				return 0;
				}
2616
			}
2617 2618 2619 2620
		if (cert->dh_tmp != NULL)
			DH_free(cert->dh_tmp);
		cert->dh_tmp=new;
		return 1;
2621
		}
2622
		/*break; */
2623
	case SSL_CTRL_SET_TMP_DH_CB:
2624
		{
2625 2626
		SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(0);
2627
		}
2628 2629
		break;
#endif
B
Bodo Möller 已提交
2630 2631 2632 2633 2634 2635 2636 2637 2638 2639
#ifndef OPENSSL_NO_ECDH
	case SSL_CTRL_SET_TMP_ECDH:
		{
		EC_KEY *ecdh = NULL;
 			
		if (parg == NULL)
			{
			SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_ECDH_LIB);
			return 0;
			}
2640 2641
		ecdh = EC_KEY_dup((EC_KEY *)parg);
		if (ecdh == NULL)
B
Bodo Möller 已提交
2642
			{
2643
			SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_EC_LIB);
B
Bodo Möller 已提交
2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670
			return 0;
			}
		if (!(ctx->options & SSL_OP_SINGLE_ECDH_USE))
			{
			if (!EC_KEY_generate_key(ecdh))
				{
				EC_KEY_free(ecdh);
				SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_ECDH_LIB);
				return 0;
				}
			}

		if (cert->ecdh_tmp != NULL)
			{
			EC_KEY_free(cert->ecdh_tmp);
			}
		cert->ecdh_tmp = ecdh;
		return 1;
		}
		/* break; */
	case SSL_CTRL_SET_TMP_ECDH_CB:
		{
		SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(0);
		}
		break;
#endif /* !OPENSSL_NO_ECDH */
2671 2672 2673 2674
#ifndef OPENSSL_NO_TLSEXT
	case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:
		ctx->tlsext_servername_arg=parg;
		break;
2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699
	case SSL_CTRL_SET_TLSEXT_TICKET_KEYS:
	case SSL_CTRL_GET_TLSEXT_TICKET_KEYS:
		{
		unsigned char *keys = parg;
		if (!keys)
			return 48;
		if (larg != 48)
			{
			SSLerr(SSL_F_SSL3_CTX_CTRL, SSL_R_INVALID_TICKET_KEYS_LENGTH);
			return 0;
			}
		if (cmd == SSL_CTRL_SET_TLSEXT_TICKET_KEYS)
			{
			memcpy(ctx->tlsext_tick_key_name, keys, 16);
			memcpy(ctx->tlsext_tick_hmac_key, keys + 16, 16);
			memcpy(ctx->tlsext_tick_aes_key, keys + 32, 16);
			}
		else
			{
			memcpy(keys, ctx->tlsext_tick_key_name, 16);
			memcpy(keys + 16, ctx->tlsext_tick_hmac_key, 16);
			memcpy(keys + 32, ctx->tlsext_tick_aes_key, 16);
			}
		return 1;
		}
2700 2701 2702 2703 2704 2705 2706

#ifdef TLSEXT_TYPE_opaque_prf_input
	case SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG:
		ctx->tlsext_opaque_prf_input_callback_arg = parg;
		return 1;
#endif

2707 2708 2709 2710 2711
	case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG:
		ctx->tlsext_status_arg=parg;
		return 1;
		break;

2712
#endif /* !OPENSSL_NO_TLSEXT */
2713

2714
	/* A Thawte special :-) */
2715 2716 2717
	case SSL_CTRL_EXTRA_CHAIN_CERT:
		if (ctx->extra_certs == NULL)
			{
B
Ben Laurie 已提交
2718
			if ((ctx->extra_certs=sk_X509_new_null()) == NULL)
2719 2720
				return(0);
			}
B
Ben Laurie 已提交
2721
		sk_X509_push(ctx->extra_certs,(X509 *)parg);
2722 2723
		break;

2724 2725 2726 2727 2728 2729
	default:
		return(0);
		}
	return(1);
	}

2730
long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
2731 2732 2733 2734 2735 2736 2737
	{
	CERT *cert;

	cert=ctx->cert;

	switch (cmd)
		{
2738
#ifndef OPENSSL_NO_RSA
2739 2740 2741 2742 2743 2744
	case SSL_CTRL_SET_TMP_RSA_CB:
		{
		cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))fp;
		}
		break;
#endif
2745
#ifndef OPENSSL_NO_DH
2746 2747 2748 2749 2750
	case SSL_CTRL_SET_TMP_DH_CB:
		{
		cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
		}
		break;
B
Bodo Möller 已提交
2751 2752 2753 2754 2755 2756 2757
#endif
#ifndef OPENSSL_NO_ECDH
	case SSL_CTRL_SET_TMP_ECDH_CB:
		{
		cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp;
		}
		break;
2758 2759 2760 2761 2762
#endif
#ifndef OPENSSL_NO_TLSEXT
	case SSL_CTRL_SET_TLSEXT_SERVERNAME_CB:
		ctx->tlsext_servername_callback=(int (*)(SSL *,int *,void *))fp;
		break;
2763 2764 2765 2766 2767 2768 2769

#ifdef TLSEXT_TYPE_opaque_prf_input
	case SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB:
		ctx->tlsext_opaque_prf_input_callback = (int (*)(SSL *,void *, size_t, void *))fp;
		break;
#endif

2770 2771 2772 2773
	case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB:
		ctx->tlsext_status_cb=(int (*)(SSL *,void *))fp;
		break;

D
Dr. Stephen Henson 已提交
2774 2775 2776 2777 2778 2779 2780
	case SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB:
		ctx->tlsext_ticket_key_cb=(int (*)(SSL *,unsigned char  *,
						unsigned char *,
						EVP_CIPHER_CTX *,
						HMAC_CTX *, int))fp;
		break;

2781 2782 2783 2784 2785 2786 2787
#endif
	default:
		return(0);
		}
	return(1);
	}

2788 2789
/* This function needs to check if the ciphers required are actually
 * available */
2790
const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
2791
	{
2792 2793
	SSL_CIPHER c;
	const SSL_CIPHER *cp;
2794 2795 2796 2797
	unsigned long id;

	id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
	c.id=id;
2798
	cp = OBJ_bsearch_ssl_cipher_id(&c, ssl3_ciphers, SSL3_NUM_CIPHERS);
2799 2800
	if (cp == NULL || cp->valid == 0)
		return NULL;
2801
	else
2802
		return cp;
2803 2804
	}

U
Ulf Möller 已提交
2805
int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818
	{
	long l;

	if (p != NULL)
		{
		l=c->id;
		if ((l & 0xff000000) != 0x03000000) return(0);
		p[0]=((unsigned char)(l>> 8L))&0xFF;
		p[1]=((unsigned char)(l     ))&0xFF;
		}
	return(2);
	}

2819 2820
SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
	     STACK_OF(SSL_CIPHER) *srvr)
2821 2822
	{
	SSL_CIPHER *c,*ret=NULL;
2823
	STACK_OF(SSL_CIPHER) *prio, *allow;
2824
	int i,ii,ok;
2825
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_EC)
2826
	unsigned int j;
2827
	int ec_ok, ec_nid;
D
Dr. Stephen Henson 已提交
2828
	unsigned char ec_search1 = 0, ec_search2 = 0;
2829
#endif
2830
	CERT *cert;
2831
	unsigned long alg_k,alg_a,mask_k,mask_a,emask_k,emask_a;
2832

2833 2834
	/* Let's see which ciphers we can support */
	cert=s->cert;
2835

2836 2837 2838 2839 2840 2841 2842 2843 2844
#if 0
	/* Do not set the compare functions, because this may lead to a
	 * reordering by "id". We want to keep the original ordering.
	 * We may pay a price in performance during sk_SSL_CIPHER_find(),
	 * but would have to pay with the price of sk_SSL_CIPHER_dup().
	 */
	sk_SSL_CIPHER_set_cmp_func(srvr, ssl_cipher_ptr_id_cmp);
	sk_SSL_CIPHER_set_cmp_func(clnt, ssl_cipher_ptr_id_cmp);
#endif
2845

B
Ben Laurie 已提交
2846
#ifdef CIPHER_DEBUG
2847 2848 2849 2850 2851 2852 2853 2854
	printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), (void *)srvr);
	for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i)
		{
		c=sk_SSL_CIPHER_value(srvr,i);
		printf("%p:%s\n",(void *)c,c->name);
		}
	printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), (void *)clnt);
	for(i=0 ; i < sk_SSL_CIPHER_num(clnt) ; ++i)
2855 2856
	    {
	    c=sk_SSL_CIPHER_value(clnt,i);
2857
	    printf("%p:%s\n",(void *)c,c->name);
B
Ben Laurie 已提交
2858 2859 2860
	    }
#endif

2861
	if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE)
2862 2863 2864 2865
		{
		prio = srvr;
		allow = clnt;
		}
2866
	else
2867 2868 2869 2870
		{
		prio = clnt;
		allow = srvr;
		}
2871 2872

	for (i=0; i<sk_SSL_CIPHER_num(prio); i++)
2873
		{
2874
		c=sk_SSL_CIPHER_value(prio,i);
2875

2876
		ssl_set_cert_masks(cert,c);
2877 2878 2879 2880
		mask_k = cert->mask_k;
		mask_a = cert->mask_a;
		emask_k = cert->export_mask_k;
		emask_a = cert->export_mask_a;
2881
			
2882
#ifdef KSSL_DEBUG
2883
/*		printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);*/
2884 2885
#endif    /* KSSL_DEBUG */

2886 2887 2888
		alg_k=c->algorithm_mkey;
		alg_a=c->algorithm_auth;

2889
#ifndef OPENSSL_NO_KRB5
2890 2891 2892 2893 2894
		if (alg_k & SSL_kKRB5)
			{
			if ( !kssl_keytab_is_available(s->kssl_ctx) )
			    continue;
			}
2895
#endif /* OPENSSL_NO_KRB5 */
2896 2897
#ifndef OPENSSL_NO_PSK
		/* with PSK there must be server callback set */
2898
		if ((alg_k & SSL_kPSK) && s->psk_server_callback == NULL)
2899 2900 2901
			continue;
#endif /* OPENSSL_NO_PSK */

2902
		if (SSL_C_IS_EXPORT(c))
2903
			{
2904
			ok = (alg_k & emask_k) && (alg_a & emask_a);
2905
#ifdef CIPHER_DEBUG
2906
			printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)\n",ok,alg_k,alg_a,emask_k,emask_a,
2907
			       (void *)c,c->name);
2908 2909 2910 2911
#endif
			}
		else
			{
2912
			ok = (alg_k & mask_k) && (alg_a & mask_a);
2913
#ifdef CIPHER_DEBUG
2914
			printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n",ok,alg_k,alg_a,mask_k,mask_a,(void *)c,
B
Ben Laurie 已提交
2915
			       c->name);
2916 2917 2918
#endif
			}

2919 2920 2921 2922
#ifndef OPENSSL_NO_TLSEXT
#ifndef OPENSSL_NO_EC
		if (
			/* if we are considering an ECC cipher suite that uses our certificate */
2923
			(alg_a & SSL_aECDSA || alg_a & SSL_aECDH)
2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972
			/* and we have an ECC certificate */
			&& (s->cert->pkeys[SSL_PKEY_ECC].x509 != NULL)
			/* and the client specified a Supported Point Formats extension */
			&& ((s->session->tlsext_ecpointformatlist_length > 0) && (s->session->tlsext_ecpointformatlist != NULL))
			/* and our certificate's point is compressed */
			&& (
				(s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info != NULL)
				&& (s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key != NULL)
				&& (s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key != NULL)
				&& (s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key->data != NULL)
				&& (
					(*(s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key->data) == POINT_CONVERSION_COMPRESSED)
					|| (*(s->cert->pkeys[SSL_PKEY_ECC].x509->cert_info->key->public_key->data) == POINT_CONVERSION_COMPRESSED + 1)
					)
				)
		)
			{
			ec_ok = 0;
			/* if our certificate's curve is over a field type that the client does not support
			 * then do not allow this cipher suite to be negotiated */
			if (
				(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec != NULL)
				&& (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group != NULL)
				&& (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth != NULL)
				&& (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_prime_field)
			)
				{
				for (j = 0; j < s->session->tlsext_ecpointformatlist_length; j++)
					{
					if (s->session->tlsext_ecpointformatlist[j] == TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime)
						{
						ec_ok = 1;
						break;
						}
					}
				}
			else if (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_characteristic_two_field)
				{
				for (j = 0; j < s->session->tlsext_ecpointformatlist_length; j++)
					{
					if (s->session->tlsext_ecpointformatlist[j] == TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2)
						{
						ec_ok = 1;
						break;
						}
					}
				}
			ok = ok && ec_ok;
			}
2973 2974
		if (
			/* if we are considering an ECC cipher suite that uses our certificate */
2975
			(alg_a & SSL_aECDSA || alg_a & SSL_aECDH)
2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024
			/* and we have an ECC certificate */
			&& (s->cert->pkeys[SSL_PKEY_ECC].x509 != NULL)
			/* and the client specified an EllipticCurves extension */
			&& ((s->session->tlsext_ellipticcurvelist_length > 0) && (s->session->tlsext_ellipticcurvelist != NULL))
		)
			{
			ec_ok = 0;
			if (
				(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec != NULL)
				&& (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group != NULL)
			)
				{
				ec_nid = EC_GROUP_get_curve_name(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group);
				if ((ec_nid == 0)
					&& (s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth != NULL)
				)
					{
					if (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_prime_field)
						{
						ec_search1 = 0xFF;
						ec_search2 = 0x01;
						}
					else if (EC_METHOD_get_field_type(s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec->group->meth) == NID_X9_62_characteristic_two_field)
						{
						ec_search1 = 0xFF;
						ec_search2 = 0x02;
						}
					}
				else
					{
					ec_search1 = 0x00;
					ec_search2 = tls1_ec_nid2curve_id(ec_nid);
					}
				if ((ec_search1 != 0) || (ec_search2 != 0))
					{
					for (j = 0; j < s->session->tlsext_ellipticcurvelist_length / 2; j++)
						{
						if ((s->session->tlsext_ellipticcurvelist[2*j] == ec_search1) && (s->session->tlsext_ellipticcurvelist[2*j+1] == ec_search2))
							{
							ec_ok = 1;
							break;
							}
						}
					}
				}
			ok = ok && ec_ok;
			}
		if (
			/* if we are considering an ECC cipher suite that uses an ephemeral EC key */
3025
			(alg_k & SSL_kEECDH)
3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069
			/* and we have an ephemeral EC key */
			&& (s->cert->ecdh_tmp != NULL)
			/* and the client specified an EllipticCurves extension */
			&& ((s->session->tlsext_ellipticcurvelist_length > 0) && (s->session->tlsext_ellipticcurvelist != NULL))
		)
			{
			ec_ok = 0;
			if (s->cert->ecdh_tmp->group != NULL)
				{
				ec_nid = EC_GROUP_get_curve_name(s->cert->ecdh_tmp->group);
				if ((ec_nid == 0)
					&& (s->cert->ecdh_tmp->group->meth != NULL)
				)
					{
					if (EC_METHOD_get_field_type(s->cert->ecdh_tmp->group->meth) == NID_X9_62_prime_field)
						{
						ec_search1 = 0xFF;
						ec_search2 = 0x01;
						}
					else if (EC_METHOD_get_field_type(s->cert->ecdh_tmp->group->meth) == NID_X9_62_characteristic_two_field)
						{
						ec_search1 = 0xFF;
						ec_search2 = 0x02;
						}
					}
				else
					{
					ec_search1 = 0x00;
					ec_search2 = tls1_ec_nid2curve_id(ec_nid);
					}
				if ((ec_search1 != 0) || (ec_search2 != 0))
					{
					for (j = 0; j < s->session->tlsext_ellipticcurvelist_length / 2; j++)
						{
						if ((s->session->tlsext_ellipticcurvelist[2*j] == ec_search1) && (s->session->tlsext_ellipticcurvelist[2*j+1] == ec_search2))
							{
							ec_ok = 1;
							break;
							}
						}
					}
				}
			ok = ok && ec_ok;
			}
3070 3071 3072
#endif /* OPENSSL_NO_EC */
#endif /* OPENSSL_NO_TLSEXT */

3073
		if (!ok) continue;
3074 3075
		ii=sk_SSL_CIPHER_find(allow,c);
		if (ii >= 0)
3076
			{
3077
			ret=sk_SSL_CIPHER_value(allow,ii);
3078 3079 3080 3081 3082 3083
			break;
			}
		}
	return(ret);
	}

U
Ulf Möller 已提交
3084
int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
3085 3086
	{
	int ret=0;
3087
	unsigned long alg_k;
3088

3089
	alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
3090

D
Dr. Stephen Henson 已提交
3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102
#ifndef OPENSSL_NO_GOST
	if (s->version >= TLS1_VERSION)
		{
		if (alg_k & SSL_kGOST)
			{
			p[ret++]=TLS_CT_GOST94_SIGN;
			p[ret++]=TLS_CT_GOST01_SIGN;
			return(ret);
			}
		}
#endif

3103
#ifndef OPENSSL_NO_DH
3104
	if (alg_k & (SSL_kDHr|SSL_kEDH))
3105
		{
3106
#  ifndef OPENSSL_NO_RSA
3107
		p[ret++]=SSL3_CT_RSA_FIXED_DH;
3108
#  endif
3109
#  ifndef OPENSSL_NO_DSA
3110
		p[ret++]=SSL3_CT_DSS_FIXED_DH;
3111
#  endif
3112
		}
3113
	if ((s->version == SSL3_VERSION) &&
3114
		(alg_k & (SSL_kEDH|SSL_kDHd|SSL_kDHr)))
3115
		{
3116
#  ifndef OPENSSL_NO_RSA
3117
		p[ret++]=SSL3_CT_RSA_EPHEMERAL_DH;
3118
#  endif
3119
#  ifndef OPENSSL_NO_DSA
3120
		p[ret++]=SSL3_CT_DSS_EPHEMERAL_DH;
3121
#  endif
3122
		}
3123 3124
#endif /* !OPENSSL_NO_DH */
#ifndef OPENSSL_NO_RSA
3125 3126
	p[ret++]=SSL3_CT_RSA_SIGN;
#endif
3127
#ifndef OPENSSL_NO_DSA
3128
	p[ret++]=SSL3_CT_DSS_SIGN;
3129
#endif
B
Bodo Möller 已提交
3130
#ifndef OPENSSL_NO_ECDH
3131
	if ((alg_k & (SSL_kECDHr|SSL_kECDHe)) && (s->version >= TLS1_VERSION))
B
Bodo Möller 已提交
3132 3133 3134 3135 3136 3137 3138 3139
		{
		p[ret++]=TLS_CT_RSA_FIXED_ECDH;
		p[ret++]=TLS_CT_ECDSA_FIXED_ECDH;
		}
#endif

#ifndef OPENSSL_NO_ECDSA
	/* 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
B
Bodo Möller 已提交
3141 3142 3143 3144 3145 3146
	 */
	if (s->version >= TLS1_VERSION)
		{
		p[ret++]=TLS_CT_ECDSA_SIGN;
		}
#endif	
3147 3148 3149
	return(ret);
	}

U
Ulf Möller 已提交
3150
int ssl3_shutdown(SSL *s)
3151
	{
D
Dr. Stephen Henson 已提交
3152
	int ret;
3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165

	/* Don't do anything much if we have not done the handshake or
	 * we don't want to send messages :-) */
	if ((s->quiet_shutdown) || (s->state == SSL_ST_BEFORE))
		{
		s->shutdown=(SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
		return(1);
		}

	if (!(s->shutdown & SSL_SENT_SHUTDOWN))
		{
		s->shutdown|=SSL_SENT_SHUTDOWN;
#if 1
3166
		ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_CLOSE_NOTIFY);
3167 3168 3169
#endif
		/* our shutdown alert has been sent now, and if it still needs
	 	 * to be written, s->s3->alert_dispatch will be true */
D
Dr. Stephen Henson 已提交
3170 3171
	 	if (s->s3->alert_dispatch)
	 		return(-1);	/* return WANT_WRITE */
3172 3173 3174 3175 3176
		}
	else if (s->s3->alert_dispatch)
		{
		/* resend it if not sent */
#if 1
D
Dr. Stephen Henson 已提交
3177 3178 3179 3180 3181 3182 3183 3184 3185
		ret=s->method->ssl_dispatch_alert(s);
		if(ret == -1)
			{
			/* we only get to return -1 here the 2nd/Nth
			 * invocation, we must  have already signalled
			 * return 0 upon a previous invoation,
			 * return WANT_WRITE */
			return(ret);
			}
3186 3187 3188 3189 3190
#endif
		}
	else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
		{
		/* If we are waiting for a close from our peer, we are closed */
B
Ben Laurie 已提交
3191
		s->method->ssl_read_bytes(s,0,NULL,0,0);
D
Dr. Stephen Henson 已提交
3192 3193 3194 3195
		if(!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
			{
			return(-1);	/* return WANT_READ */
			}
3196 3197 3198 3199 3200 3201 3202 3203 3204
		}

	if ((s->shutdown == (SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN)) &&
		!s->s3->alert_dispatch)
		return(1);
	else
		return(0);
	}

B
Ben Laurie 已提交
3205
int ssl3_write(SSL *s, const void *buf, int len)
3206 3207 3208 3209 3210 3211 3212 3213 3214 3215
	{
	int ret,n;

#if 0
	if (s->shutdown & SSL_SEND_SHUTDOWN)
		{
		s->rwstate=SSL_NOTHING;
		return(0);
		}
#endif
3216 3217
	clear_sys_error();
	if (s->s3->renegotiate) ssl3_renegotiate_check(s);
3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229

	/* This is an experimental flag that sends the
	 * last handshake message in the same packet as the first
	 * use data - used to see if it helps the TCP protocol during
	 * session-id reuse */
	/* The second test is because the buffer may have been removed */
	if ((s->s3->flags & SSL3_FLAGS_POP_BUFFER) && (s->wbio == s->bbio))
		{
		/* First time through, we write into the buffer */
		if (s->s3->delay_buf_pop_ret == 0)
			{
			ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
B
Ben Laurie 已提交
3230
					     buf,len);
3231 3232 3233 3234 3235 3236 3237 3238 3239 3240
			if (ret <= 0) return(ret);

			s->s3->delay_buf_pop_ret=ret;
			}

		s->rwstate=SSL_WRITING;
		n=BIO_flush(s->wbio);
		if (n <= 0) return(n);
		s->rwstate=SSL_NOTHING;

3241 3242 3243 3244
		/* We have flushed the buffer, so remove it */
		ssl_free_wbio_buffer(s);
		s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;

3245 3246 3247 3248 3249
		ret=s->s3->delay_buf_pop_ret;
		s->s3->delay_buf_pop_ret=0;
		}
	else
		{
B
Ben Laurie 已提交
3250 3251
		ret=s->method->ssl_write_bytes(s,SSL3_RT_APPLICATION_DATA,
			buf,len);
3252 3253
		if (ret <= 0) return(ret);
		}
3254

3255 3256 3257
	return(ret);
	}

B
Bodo Möller 已提交
3258
static int ssl3_read_internal(SSL *s, void *buf, int len, int peek)
3259
	{
3260 3261 3262 3263 3264
	int ret;
	
	clear_sys_error();
	if (s->s3->renegotiate) ssl3_renegotiate_check(s);
	s->s3->in_read_app_data=1;
B
Ben Laurie 已提交
3265
	ret=s->method->ssl_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
3266
	if ((ret == -1) && (s->s3->in_read_app_data == 2))
3267
		{
3268 3269 3270
		/* ssl3_read_bytes decided to call s->handshake_func, which
		 * called ssl3_read_bytes to read handshake data.
		 * However, ssl3_read_bytes actually found application data
3271
		 * and thinks that application data makes sense here; so disable
3272
		 * handshake processing and try to read application data again. */
3273
		s->in_handshake++;
B
Ben Laurie 已提交
3274
		ret=s->method->ssl_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
3275 3276 3277 3278 3279 3280
		s->in_handshake--;
		}
	else
		s->s3->in_read_app_data=0;

	return(ret);
3281 3282
	}

B
Bodo Möller 已提交
3283
int ssl3_read(SSL *s, void *buf, int len)
3284
	{
B
Bodo Möller 已提交
3285 3286
	return ssl3_read_internal(s, buf, len, 0);
	}
3287

3288
int ssl3_peek(SSL *s, void *buf, int len)
B
Bodo Möller 已提交
3289
	{
B
typo  
Bodo Möller 已提交
3290
	return ssl3_read_internal(s, buf, len, 1);
3291 3292
	}

U
Ulf Möller 已提交
3293
int ssl3_renegotiate(SSL *s)
3294 3295 3296 3297 3298 3299 3300
	{
	if (s->handshake_func == NULL)
		return(1);

	if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)
		return(0);

3301
	s->s3->renegotiate=1;
3302 3303 3304
	return(1);
	}

U
Ulf Möller 已提交
3305
int ssl3_renegotiate_check(SSL *s)
3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316
	{
	int ret=0;

	if (s->s3->renegotiate)
		{
		if (	(s->s3->rbuf.left == 0) &&
			(s->s3->wbuf.left == 0) &&
			!SSL_in_init(s))
			{
/*
if we are the server, and we have sent a 'RENEGOTIATE' message, we
U
Ulf Möller 已提交
3317
need to go to SSL_ST_ACCEPT.
3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329
*/
			/* SSL_ST_ACCEPT */
			s->state=SSL_ST_RENEGOTIATE;
			s->s3->renegotiate=0;
			s->s3->num_renegotiations++;
			s->s3->total_renegotiations++;
			ret=1;
			}
		}
	return(ret);
	}