s3_lib.c 49.7 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
/* ====================================================================
B
Bodo Möller 已提交
59
 * Copyright (c) 1998-2002 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 124 125 126 127 128 129 130 131 132 133 134 135 136
/* ====================================================================
 * 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.
 *
 * In addition, Sun covenants to all licensees who provide a reciprocal
 * covenant with respect to their own patents if any, not to sue under
 * current and future patent claims necessarily infringed by the making,
 * using, practicing, selling, offering for sale and/or otherwise
 * disposing of the Contribution as delivered hereunder 
 * (or portions thereof), provided that such covenant shall not apply:
 *  1) for code that a licensee deletes from the Contribution;
 *  2) separates from the Contribution; or
 *  3) for infringements caused by:
 *       i) the modification of the Contribution or
 *      ii) the combination of the  Contribution with other software or
 *          devices where such combination causes the infringement.
 *
 * ECC cipher suite support in OpenSSL originally written by
 * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
 *
 */
137 138

#include <stdio.h>
139
#include <openssl/objects.h>
140
#include "ssl_locl.h"
141
#include "kssl_lcl.h"
142
#include <openssl/md5.h>
143

B
Ben Laurie 已提交
144
const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
145 146 147 148

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

static long ssl3_default_timeout(void );
U
Ulf Möller 已提交
149

B
Bodo Möller 已提交
150
OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
151 152 153 154 155 156
/* The RSA ciphers */
/* Cipher 01 */
	{
	1,
	SSL3_TXT_RSA_NULL_MD5,
	SSL3_CK_RSA_NULL_MD5,
157
	SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_MD5|SSL_SSLV3,
158
	SSL_NOT_EXP|SSL_STRONG_NONE,
159 160
	0,
	0,
161 162
	0,
	SSL_ALL_CIPHERS,
163
	SSL_ALL_STRENGTHS,
164 165 166 167 168 169
	},
/* Cipher 02 */
	{
	1,
	SSL3_TXT_RSA_NULL_SHA,
	SSL3_CK_RSA_NULL_SHA,
170
	SSL_kRSA|SSL_aRSA|SSL_eNULL |SSL_SHA1|SSL_SSLV3,
171
	SSL_NOT_EXP|SSL_STRONG_NONE,
172 173
	0,
	0,
174 175
	0,
	SSL_ALL_CIPHERS,
176
	SSL_ALL_STRENGTHS,
177 178 179 180 181 182 183 184
	},

/* anon DH */
/* Cipher 17 */
	{
	1,
	SSL3_TXT_ADH_RC4_40_MD5,
	SSL3_CK_ADH_RC4_40_MD5,
185 186
	SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5 |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
187
	0,
188 189
	40,
	128,
190
	SSL_ALL_CIPHERS,
191
	SSL_ALL_STRENGTHS,
192 193 194 195 196 197
	},
/* Cipher 18 */
	{
	1,
	SSL3_TXT_ADH_RC4_128_MD5,
	SSL3_CK_ADH_RC4_128_MD5,
198
	SSL_kEDH |SSL_aNULL|SSL_RC4  |SSL_MD5 |SSL_SSLV3,
L
Lutz Jänicke 已提交
199
	SSL_NOT_EXP|SSL_MEDIUM,
200
	0,
201 202
	128,
	128,
203
	SSL_ALL_CIPHERS,
204
	SSL_ALL_STRENGTHS,
205 206 207 208 209 210
	},
/* Cipher 19 */
	{
	1,
	SSL3_TXT_ADH_DES_40_CBC_SHA,
	SSL3_CK_ADH_DES_40_CBC_SHA,
211 212
	SSL_kEDH |SSL_aNULL|SSL_DES|SSL_SHA1|SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
213
	0,
214 215
	40,
	128,
216
	SSL_ALL_CIPHERS,
217
	SSL_ALL_STRENGTHS,
218 219 220 221 222 223
	},
/* Cipher 1A */
	{
	1,
	SSL3_TXT_ADH_DES_64_CBC_SHA,
	SSL3_CK_ADH_DES_64_CBC_SHA,
224
	SSL_kEDH |SSL_aNULL|SSL_DES  |SSL_SHA1|SSL_SSLV3,
L
Lutz Jänicke 已提交
225
	SSL_NOT_EXP|SSL_LOW,
226
	0,
227 228
	56,
	56,
229
	SSL_ALL_CIPHERS,
230
	SSL_ALL_STRENGTHS,
231 232 233 234
	},
/* Cipher 1B */
	{
	1,
235 236
	SSL3_TXT_ADH_DES_192_CBC_SHA,
	SSL3_CK_ADH_DES_192_CBC_SHA,
237
	SSL_kEDH |SSL_aNULL|SSL_3DES |SSL_SHA1|SSL_SSLV3,
L
Lutz Jänicke 已提交
238
	SSL_NOT_EXP|SSL_HIGH,
239
	0,
240 241
	168,
	168,
242
	SSL_ALL_CIPHERS,
243
	SSL_ALL_STRENGTHS,
244 245 246 247 248 249 250 251
	},

/* RSA again */
/* Cipher 03 */
	{
	1,
	SSL3_TXT_RSA_RC4_40_MD5,
	SSL3_CK_RSA_RC4_40_MD5,
252 253
	SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5 |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
254
	0,
255 256
	40,
	128,
257
	SSL_ALL_CIPHERS,
258
	SSL_ALL_STRENGTHS,
259 260 261 262 263 264
	},
/* Cipher 04 */
	{
	1,
	SSL3_TXT_RSA_RC4_128_MD5,
	SSL3_CK_RSA_RC4_128_MD5,
265 266
	SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_MD5|SSL_SSLV3,
	SSL_NOT_EXP|SSL_MEDIUM,
267
	0,
268 269
	128,
	128,
270
	SSL_ALL_CIPHERS,
271
	SSL_ALL_STRENGTHS,
272 273 274 275 276 277
	},
/* Cipher 05 */
	{
	1,
	SSL3_TXT_RSA_RC4_128_SHA,
	SSL3_CK_RSA_RC4_128_SHA,
278 279
	SSL_kRSA|SSL_aRSA|SSL_RC4  |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_MEDIUM,
280
	0,
281 282
	128,
	128,
283
	SSL_ALL_CIPHERS,
284
	SSL_ALL_STRENGTHS,
285 286 287 288 289 290
	},
/* Cipher 06 */
	{
	1,
	SSL3_TXT_RSA_RC2_40_MD5,
	SSL3_CK_RSA_RC2_40_MD5,
291 292
	SSL_kRSA|SSL_aRSA|SSL_RC2  |SSL_MD5 |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
293
	0,
294 295
	40,
	128,
296
	SSL_ALL_CIPHERS,
297
	SSL_ALL_STRENGTHS,
298 299 300 301 302 303
	},
/* Cipher 07 */
	{
	1,
	SSL3_TXT_RSA_IDEA_128_SHA,
	SSL3_CK_RSA_IDEA_128_SHA,
304 305
	SSL_kRSA|SSL_aRSA|SSL_IDEA |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_MEDIUM,
306
	0,
307 308
	128,
	128,
309
	SSL_ALL_CIPHERS,
310
	SSL_ALL_STRENGTHS,
311 312 313 314 315 316
	},
/* Cipher 08 */
	{
	1,
	SSL3_TXT_RSA_DES_40_CBC_SHA,
	SSL3_CK_RSA_DES_40_CBC_SHA,
317 318
	SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
319
	0,
320 321
	40,
	56,
322
	SSL_ALL_CIPHERS,
323
	SSL_ALL_STRENGTHS,
324 325 326 327 328 329
	},
/* Cipher 09 */
	{
	1,
	SSL3_TXT_RSA_DES_64_CBC_SHA,
	SSL3_CK_RSA_DES_64_CBC_SHA,
330 331
	SSL_kRSA|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_LOW,
332
	0,
333 334
	56,
	56,
335
	SSL_ALL_CIPHERS,
336
	SSL_ALL_STRENGTHS,
337 338 339 340 341 342
	},
/* Cipher 0A */
	{
	1,
	SSL3_TXT_RSA_DES_192_CBC3_SHA,
	SSL3_CK_RSA_DES_192_CBC3_SHA,
343 344
	SSL_kRSA|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_HIGH,
345
	0,
346 347
	168,
	168,
348
	SSL_ALL_CIPHERS,
349
	SSL_ALL_STRENGTHS,
350 351 352 353 354 355 356 357
	},

/*  The DH ciphers */
/* Cipher 0B */
	{
	0,
	SSL3_TXT_DH_DSS_DES_40_CBC_SHA,
	SSL3_CK_DH_DSS_DES_40_CBC_SHA,
358 359
	SSL_kDHd |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
360
	0,
361 362
	40,
	56,
363
	SSL_ALL_CIPHERS,
364
	SSL_ALL_STRENGTHS,
365 366 367 368 369 370
	},
/* Cipher 0C */
	{
	0,
	SSL3_TXT_DH_DSS_DES_64_CBC_SHA,
	SSL3_CK_DH_DSS_DES_64_CBC_SHA,
371 372
	SSL_kDHd |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_LOW,
373
	0,
374 375
	56,
	56,
376
	SSL_ALL_CIPHERS,
377
	SSL_ALL_STRENGTHS,
378 379 380 381 382 383
	},
/* Cipher 0D */
	{
	0,
	SSL3_TXT_DH_DSS_DES_192_CBC3_SHA,
	SSL3_CK_DH_DSS_DES_192_CBC3_SHA,
384 385
	SSL_kDHd |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_HIGH,
386
	0,
387 388
	168,
	168,
389
	SSL_ALL_CIPHERS,
390
	SSL_ALL_STRENGTHS,
391 392 393 394 395 396
	},
/* Cipher 0E */
	{
	0,
	SSL3_TXT_DH_RSA_DES_40_CBC_SHA,
	SSL3_CK_DH_RSA_DES_40_CBC_SHA,
397 398
	SSL_kDHr |SSL_aDH|SSL_DES|SSL_SHA1|SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
399
	0,
400 401
	40,
	56,
402
	SSL_ALL_CIPHERS,
403
	SSL_ALL_STRENGTHS,
404 405 406 407 408 409
	},
/* Cipher 0F */
	{
	0,
	SSL3_TXT_DH_RSA_DES_64_CBC_SHA,
	SSL3_CK_DH_RSA_DES_64_CBC_SHA,
410 411
	SSL_kDHr |SSL_aDH|SSL_DES  |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_LOW,
412
	0,
413 414
	56,
	56,
415
	SSL_ALL_CIPHERS,
416
	SSL_ALL_STRENGTHS,
417 418 419 420 421 422
	},
/* Cipher 10 */
	{
	0,
	SSL3_TXT_DH_RSA_DES_192_CBC3_SHA,
	SSL3_CK_DH_RSA_DES_192_CBC3_SHA,
423 424
	SSL_kDHr |SSL_aDH|SSL_3DES |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_HIGH,
425
	0,
426 427
	168,
	168,
428
	SSL_ALL_CIPHERS,
429
	SSL_ALL_STRENGTHS,
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
	SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA1|SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
440
	0,
441 442
	40,
	56,
443
	SSL_ALL_CIPHERS,
444
	SSL_ALL_STRENGTHS,
445 446 447 448 449 450
	},
/* Cipher 12 */
	{
	1,
	SSL3_TXT_EDH_DSS_DES_64_CBC_SHA,
	SSL3_CK_EDH_DSS_DES_64_CBC_SHA,
451 452
	SSL_kEDH|SSL_aDSS|SSL_DES  |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_LOW,
453
	0,
454 455
	56,
	56,
456
	SSL_ALL_CIPHERS,
457
	SSL_ALL_STRENGTHS,
458 459 460 461 462 463
	},
/* Cipher 13 */
	{
	1,
	SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA,
	SSL3_CK_EDH_DSS_DES_192_CBC3_SHA,
464 465
	SSL_kEDH|SSL_aDSS|SSL_3DES |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_HIGH,
466
	0,
467 468
	168,
	168,
469
	SSL_ALL_CIPHERS,
470
	SSL_ALL_STRENGTHS,
471 472 473 474 475 476
	},
/* Cipher 14 */
	{
	1,
	SSL3_TXT_EDH_RSA_DES_40_CBC_SHA,
	SSL3_CK_EDH_RSA_DES_40_CBC_SHA,
477 478
	SSL_kEDH|SSL_aRSA|SSL_DES|SSL_SHA1|SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
479
	0,
480 481
	40,
	56,
482
	SSL_ALL_CIPHERS,
483
	SSL_ALL_STRENGTHS,
484 485 486 487 488 489
	},
/* Cipher 15 */
	{
	1,
	SSL3_TXT_EDH_RSA_DES_64_CBC_SHA,
	SSL3_CK_EDH_RSA_DES_64_CBC_SHA,
490 491
	SSL_kEDH|SSL_aRSA|SSL_DES  |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_LOW,
492
	0,
493 494
	56,
	56,
495
	SSL_ALL_CIPHERS,
496
	SSL_ALL_STRENGTHS,
497 498 499 500 501 502
	},
/* Cipher 16 */
	{
	1,
	SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA,
	SSL3_CK_EDH_RSA_DES_192_CBC3_SHA,
503 504
	SSL_kEDH|SSL_aRSA|SSL_3DES |SSL_SHA1|SSL_SSLV3,
	SSL_NOT_EXP|SSL_HIGH,
505
	0,
506 507
	168,
	168,
508
	SSL_ALL_CIPHERS,
509
	SSL_ALL_STRENGTHS,
510 511 512 513 514 515 516 517
	},

/* Fortezza */
/* Cipher 1C */
	{
	0,
	SSL3_TXT_FZA_DMS_NULL_SHA,
	SSL3_CK_FZA_DMS_NULL_SHA,
518
	SSL_kFZA|SSL_aFZA |SSL_eNULL |SSL_SHA1|SSL_SSLV3,
519
	SSL_NOT_EXP|SSL_STRONG_NONE,
520 521
	0,
	0,
522 523
	0,
	SSL_ALL_CIPHERS,
524
	SSL_ALL_STRENGTHS,
525 526 527 528 529 530 531
	},

/* Cipher 1D */
	{
	0,
	SSL3_TXT_FZA_DMS_FZA_SHA,
	SSL3_CK_FZA_DMS_FZA_SHA,
532
	SSL_kFZA|SSL_aFZA |SSL_eFZA |SSL_SHA1|SSL_SSLV3,
533
	SSL_NOT_EXP|SSL_STRONG_NONE,
534 535
	0,
	0,
536 537
	0,
	SSL_ALL_CIPHERS,
538
	SSL_ALL_STRENGTHS,
539 540
	},

541
#if 0
542 543 544 545 546
/* Cipher 1E */
	{
	0,
	SSL3_TXT_FZA_DMS_RC4_SHA,
	SSL3_CK_FZA_DMS_RC4_SHA,
547
	SSL_kFZA|SSL_aFZA |SSL_RC4  |SSL_SHA1|SSL_SSLV3,
L
Lutz Jänicke 已提交
548
	SSL_NOT_EXP|SSL_MEDIUM,
549
	0,
550 551
	128,
	128,
552
	SSL_ALL_CIPHERS,
553
	SSL_ALL_STRENGTHS,
554
	},
555
#endif
556

557
#ifndef OPENSSL_NO_KRB5
558 559 560 561
/* The Kerberos ciphers
** 20000107 VRS: And the first shall be last,
** in hopes of avoiding the lynx ssl renegotiation problem.
*/
562
/* Cipher 1E VRS */
563 564
	{
	1,
565 566
	SSL3_TXT_KRB5_DES_64_CBC_SHA,
	SSL3_CK_KRB5_DES_64_CBC_SHA,
567
	SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_SHA1   |SSL_SSLV3,
568
	SSL_NOT_EXP|SSL_LOW,
569
	0,
570
	56,
571 572 573 574 575
	56,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

576
/* Cipher 1F VRS */
577 578
	{
	1,
579 580 581 582
	SSL3_TXT_KRB5_DES_192_CBC3_SHA,
	SSL3_CK_KRB5_DES_192_CBC3_SHA,
	SSL_kKRB5|SSL_aKRB5|  SSL_3DES|SSL_SHA1  |SSL_SSLV3,
	SSL_NOT_EXP|SSL_HIGH,
583
	0,
584 585
	112,
	168,
586 587 588 589
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

590
/* Cipher 20 VRS */
591 592
	{
	1,
593 594 595 596
	SSL3_TXT_KRB5_RC4_128_SHA,
	SSL3_CK_KRB5_RC4_128_SHA,
	SSL_kKRB5|SSL_aKRB5|  SSL_RC4|SSL_SHA1  |SSL_SSLV3,
	SSL_NOT_EXP|SSL_MEDIUM,
597
	0,
598 599
	128,
	128,
600 601 602 603
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

604 605 606 607 608 609 610 611 612 613 614 615 616 617 618
/* Cipher 21 VRS */
	{
	1,
	SSL3_TXT_KRB5_IDEA_128_CBC_SHA,
	SSL3_CK_KRB5_IDEA_128_CBC_SHA,
	SSL_kKRB5|SSL_aKRB5|  SSL_IDEA|SSL_SHA1  |SSL_SSLV3,
	SSL_NOT_EXP|SSL_MEDIUM,
	0,
	128,
	128,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

/* Cipher 22 VRS */
619 620 621 622 623 624 625 626 627 628 629 630 631
	{
	1,
	SSL3_TXT_KRB5_DES_64_CBC_MD5,
	SSL3_CK_KRB5_DES_64_CBC_MD5,
	SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_MD5    |SSL_SSLV3,
	SSL_NOT_EXP|SSL_LOW,
	0,
	56,
	56,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

632
/* Cipher 23 VRS */
633 634
	{
	1,
635 636 637
	SSL3_TXT_KRB5_DES_192_CBC3_MD5,
	SSL3_CK_KRB5_DES_192_CBC3_MD5,
	SSL_kKRB5|SSL_aKRB5|  SSL_3DES|SSL_MD5   |SSL_SSLV3,
638 639 640 641 642 643 644 645
	SSL_NOT_EXP|SSL_HIGH,
	0,
	112,
	168,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673
/* Cipher 24 VRS */
	{
	1,
	SSL3_TXT_KRB5_RC4_128_MD5,
	SSL3_CK_KRB5_RC4_128_MD5,
	SSL_kKRB5|SSL_aKRB5|  SSL_RC4|SSL_MD5  |SSL_SSLV3,
	SSL_NOT_EXP|SSL_MEDIUM,
	0,
	128,
	128,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

/* Cipher 25 VRS */
	{
	1,
	SSL3_TXT_KRB5_IDEA_128_CBC_MD5,
	SSL3_CK_KRB5_IDEA_128_CBC_MD5,
	SSL_kKRB5|SSL_aKRB5|  SSL_IDEA|SSL_MD5  |SSL_SSLV3,
	SSL_NOT_EXP|SSL_MEDIUM,
	0,
	128,
	128,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

674 675 676
/* Cipher 26 VRS */
	{
	1,
677 678 679 680
	SSL3_TXT_KRB5_DES_40_CBC_SHA,
	SSL3_CK_KRB5_DES_40_CBC_SHA,
	SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_SHA1   |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
681
	0,
682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704
	40,
	56,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

/* Cipher 27 VRS */
	{
	1,
	SSL3_TXT_KRB5_RC2_40_CBC_SHA,
	SSL3_CK_KRB5_RC2_40_CBC_SHA,
	SSL_kKRB5|SSL_aKRB5|  SSL_RC2|SSL_SHA1   |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
	0,
	40,
	128,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

/* Cipher 28 VRS */
	{
	1,
R
Typos.  
Richard Levitte 已提交
705 706
	SSL3_TXT_KRB5_RC4_40_SHA,
	SSL3_CK_KRB5_RC4_40_SHA,
707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746
	SSL_kKRB5|SSL_aKRB5|  SSL_RC4|SSL_SHA1   |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
	0,
	128,
	128,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

/* Cipher 29 VRS */
	{
	1,
	SSL3_TXT_KRB5_DES_40_CBC_MD5,
	SSL3_CK_KRB5_DES_40_CBC_MD5,
	SSL_kKRB5|SSL_aKRB5|  SSL_DES|SSL_MD5    |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
	0,
	40,
	56,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

/* Cipher 2A VRS */
	{
	1,
	SSL3_TXT_KRB5_RC2_40_CBC_MD5,
	SSL3_CK_KRB5_RC2_40_CBC_MD5,
	SSL_kKRB5|SSL_aKRB5|  SSL_RC2|SSL_MD5    |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
	0,
	40,
	128,
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},

/* Cipher 2B VRS */
	{
	1,
R
Typos.  
Richard Levitte 已提交
747 748
	SSL3_TXT_KRB5_RC4_40_MD5,
	SSL3_CK_KRB5_RC4_40_MD5,
749 750 751 752 753
	SSL_kKRB5|SSL_aKRB5|  SSL_RC4|SSL_MD5    |SSL_SSLV3,
	SSL_EXPORT|SSL_EXP40,
	0,
	128,
	128,
754 755 756
	SSL_ALL_CIPHERS,
	SSL_ALL_STRENGTHS,
	},
757
#endif	/* OPENSSL_NO_KRB5 */
D
 
Dr. Stephen Henson 已提交
758 759


B
Ben Laurie 已提交
760
#if TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES
761 762 763 764
	/* New TLS Export CipherSuites */
	/* Cipher 60 */
	    {
	    1,
765 766
	    TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5,
	    TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5,
767 768
	    SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_MD5|SSL_TLSV1,
	    SSL_EXPORT|SSL_EXP56,
769
	    0,
770 771 772 773
	    56,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
774 775 776 777
	    },
	/* Cipher 61 */
	    {
	    1,
778 779
	    TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
	    TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5,
780 781
	    SSL_kRSA|SSL_aRSA|SSL_RC2|SSL_MD5|SSL_TLSV1,
	    SSL_EXPORT|SSL_EXP56,
782
	    0,
783 784 785 786
	    56,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
787 788 789 790
	    },
	/* Cipher 62 */
	    {
	    1,
791 792
	    TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA,
	    TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA,
793 794
	    SSL_kRSA|SSL_aRSA|SSL_DES|SSL_SHA|SSL_TLSV1,
	    SSL_EXPORT|SSL_EXP56,
795
	    0,
796 797 798 799
	    56,
	    56,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
800
	    },
801 802 803 804 805
	/* Cipher 63 */
	    {
	    1,
	    TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
	    TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA,
806 807
	    SSL_kEDH|SSL_aDSS|SSL_DES|SSL_SHA|SSL_TLSV1,
	    SSL_EXPORT|SSL_EXP56,
808
	    0,
809 810 811 812
	    56,
	    56,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
813 814 815 816 817 818
	    },
	/* Cipher 64 */
	    {
	    1,
	    TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA,
	    TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA,
819 820
	    SSL_kRSA|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
	    SSL_EXPORT|SSL_EXP56,
821
	    0,
822 823 824 825
	    56,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
826 827 828 829 830 831
	    },
	/* Cipher 65 */
	    {
	    1,
	    TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
	    TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA,
832 833
	    SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
	    SSL_EXPORT|SSL_EXP56,
834
	    0,
835 836 837 838
	    56,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
839 840 841 842 843 844 845
	    },
	/* Cipher 66 */
	    {
	    1,
	    TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA,
	    TLS1_CK_DHE_DSS_WITH_RC4_128_SHA,
	    SSL_kEDH|SSL_aDSS|SSL_RC4|SSL_SHA|SSL_TLSV1,
L
Lutz Jänicke 已提交
846
	    SSL_NOT_EXP|SSL_MEDIUM,
847
	    0,
848 849 850 851
	    128,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS
852
	    },
D
 
Dr. Stephen Henson 已提交
853 854 855 856
#endif
	/* New AES ciphersuites */

	/* Cipher 2F */
857 858
	    {
	    1,
D
 
Dr. Stephen Henson 已提交
859 860 861 862
	    TLS1_TXT_RSA_WITH_AES_128_SHA,
	    TLS1_CK_RSA_WITH_AES_128_SHA,
	    SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
	    SSL_NOT_EXP|SSL_MEDIUM,
863 864 865 866 867 868
	    0,
	    128,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
D
 
Dr. Stephen Henson 已提交
869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012
	/* Cipher 30 */
	    {
	    0,
	    TLS1_TXT_DH_DSS_WITH_AES_128_SHA,
	    TLS1_CK_DH_DSS_WITH_AES_128_SHA,
	    SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_MEDIUM,
	    0,
	    128,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 31 */
	    {
	    0,
	    TLS1_TXT_DH_RSA_WITH_AES_128_SHA,
	    TLS1_CK_DH_RSA_WITH_AES_128_SHA,
	    SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_MEDIUM,
	    0,
	    128,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 32 */
	    {
	    1,
	    TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,
	    TLS1_CK_DHE_DSS_WITH_AES_128_SHA,
	    SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_MEDIUM,
	    0,
	    128,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 33 */
	    {
	    1,
	    TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,
	    TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
	    SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_MEDIUM,
	    0,
	    128,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 34 */
	    {
	    1,
	    TLS1_TXT_ADH_WITH_AES_128_SHA,
	    TLS1_CK_ADH_WITH_AES_128_SHA,
	    SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_MEDIUM,
	    0,
	    128,
	    128,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },

	/* Cipher 35 */
	    {
	    1,
	    TLS1_TXT_RSA_WITH_AES_256_SHA,
	    TLS1_CK_RSA_WITH_AES_256_SHA,
	    SSL_kRSA|SSL_aRSA|SSL_AES|SSL_SHA |SSL_TLSV1,
	    SSL_NOT_EXP|SSL_HIGH,
	    0,
	    256,
	    256,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 36 */
	    {
	    0,
	    TLS1_TXT_DH_DSS_WITH_AES_256_SHA,
	    TLS1_CK_DH_DSS_WITH_AES_256_SHA,
	    SSL_kDHd|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_HIGH,
	    0,
	    256,
	    256,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 37 */
	    {
	    0,
	    TLS1_TXT_DH_RSA_WITH_AES_256_SHA,
	    TLS1_CK_DH_RSA_WITH_AES_256_SHA,
	    SSL_kDHr|SSL_aDH|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_HIGH,
	    0,
	    256,
	    256,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 38 */
	    {
	    1,
	    TLS1_TXT_DHE_DSS_WITH_AES_256_SHA,
	    TLS1_CK_DHE_DSS_WITH_AES_256_SHA,
	    SSL_kEDH|SSL_aDSS|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_HIGH,
	    0,
	    256,
	    256,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 39 */
	    {
	    1,
	    TLS1_TXT_DHE_RSA_WITH_AES_256_SHA,
	    TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
	    SSL_kEDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_HIGH,
	    0,
	    256,
	    256,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
	/* Cipher 3A */
	    {
	    1,
	    TLS1_TXT_ADH_WITH_AES_256_SHA,
	    TLS1_CK_ADH_WITH_AES_256_SHA,
	    SSL_kEDH|SSL_aNULL|SSL_AES|SSL_SHA|SSL_TLSV1,
	    SSL_NOT_EXP|SSL_HIGH,
	    0,
	    256,
	    256,
	    SSL_ALL_CIPHERS,
	    SSL_ALL_STRENGTHS,
	    },
1013

B
Bodo Möller 已提交
1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 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 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363
#ifndef OPENSSL_NO_ECDH
	/* Cipher 47 */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA,
            TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_eNULL|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP,
            0,
            0,
            0,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 48 */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA,
            TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP,
            0,
            128,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 49 */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_WITH_DES_CBC_SHA,
            TLS1_CK_ECDH_ECDSA_WITH_DES_CBC_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_DES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_LOW,
            0,
            56,
            56,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 4A */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA,
            TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_3DES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_HIGH,
            0,
            168,
            168,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 4B */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
            TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_MEDIUM,
            0,
            128,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 4C */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
            TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_HIGH,
            0,
            256,
            256,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 5B */
	/* XXX NOTE: The ECC/TLS draft has a bug and reuses 4B for this */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_EXPORT_WITH_RC4_40_SHA,
            TLS1_CK_ECDH_ECDSA_EXPORT_WITH_RC4_40_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_EXPORT|SSL_EXP40,
            0,
            40,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 5C */
	/* XXX NOTE: The ECC/TLS draft has a bug and reuses 4C for this */
	    {
            1,
            TLS1_TXT_ECDH_ECDSA_EXPORT_WITH_RC4_56_SHA,
            TLS1_CK_ECDH_ECDSA_EXPORT_WITH_RC4_56_SHA,
            SSL_kECDH|SSL_aECDSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_EXPORT|SSL_EXP56,
            0,
            56,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 4D */
	    {
            1,
            TLS1_TXT_ECDH_RSA_WITH_NULL_SHA,
            TLS1_CK_ECDH_RSA_WITH_NULL_SHA,
            SSL_kECDH|SSL_aRSA|SSL_eNULL|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP,
            0,
            0,
            0,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 4E */
	    {
            1,
            TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA,
            TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA,
            SSL_kECDH|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP,
            0,
            128,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 4F */
	    {
            1,
            TLS1_TXT_ECDH_RSA_WITH_DES_CBC_SHA,
            TLS1_CK_ECDH_RSA_WITH_DES_CBC_SHA,
            SSL_kECDH|SSL_aRSA|SSL_DES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_LOW,
            0,
            56,
            56,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 50 */
	    {
            1,
            TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA,
            TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA,
            SSL_kECDH|SSL_aRSA|SSL_3DES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_HIGH,
            0,
            168,
            168,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 51 */
	    {
            1,
            TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA,
            TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA,
            SSL_kECDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_MEDIUM,
            0,
            128,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 52 */
	    {
            1,
            TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA,
            TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA,
            SSL_kECDH|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_HIGH,
            0,
            256,
            256,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 53 */
	    {
            1,
            TLS1_TXT_ECDH_RSA_EXPORT_WITH_RC4_40_SHA,
            TLS1_CK_ECDH_RSA_EXPORT_WITH_RC4_40_SHA,
            SSL_kECDH|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_EXPORT|SSL_EXP40,
            0,
            40,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 54 */
	    {
            1,
            TLS1_TXT_ECDH_RSA_EXPORT_WITH_RC4_56_SHA,
            TLS1_CK_ECDH_RSA_EXPORT_WITH_RC4_56_SHA,
            SSL_kECDH|SSL_aRSA|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_EXPORT|SSL_EXP56,
            0,
            56,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 55 */
            {
            1,
            TLS1_TXT_ECDH_anon_WITH_NULL_SHA,
            TLS1_CK_ECDH_anon_WITH_NULL_SHA,
            SSL_kECDHE|SSL_aNULL|SSL_eNULL|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP,
            0,
            0,
            0,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
	    },

	/* Cipher 56 */
            {
            1,
            TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA,
            TLS1_CK_ECDH_anon_WITH_RC4_128_SHA,
            SSL_kECDHE|SSL_aNULL|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP,
            0,
            128,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
	    },

	/* Cipher 57 */
	    {
            1,
            TLS1_TXT_ECDH_anon_WITH_DES_CBC_SHA,
            TLS1_CK_ECDH_anon_WITH_DES_CBC_SHA,
            SSL_kECDHE|SSL_aNULL|SSL_DES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_LOW,
            0,
            56,
            56,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 58 */
	    {
            1,
            TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA,
            TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA,
            SSL_kECDHE|SSL_aNULL|SSL_3DES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_HIGH,
            0,
            168,
            168,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 59 */
	    {
            1,
            TLS1_TXT_ECDH_anon_EXPORT_WITH_DES_40_CBC_SHA,
            TLS1_CK_ECDH_anon_EXPORT_WITH_DES_40_CBC_SHA,
            SSL_kECDHE|SSL_aNULL|SSL_DES|SSL_SHA|SSL_TLSV1,
            SSL_EXPORT|SSL_EXP40,
            0,
            40,
            56,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 5A */
	    {
            1,
            TLS1_TXT_ECDH_anon_EXPORT_WITH_RC4_40_SHA,
            TLS1_CK_ECDH_anon_EXPORT_WITH_RC4_40_SHA,
            SSL_kECDHE|SSL_aNULL|SSL_RC4|SSL_SHA|SSL_TLSV1,
            SSL_EXPORT|SSL_EXP40,
            0,
            40,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 77 XXX: ECC ciphersuites offering forward secrecy
	 * are not yet specified in the ECC/TLS draft but our code
	 * allows them to be implemented very easily. To add such
	 * a cipher suite, one needs to add two constant definitions
	 * to tls1.h and a new structure in this file as shown below. We 
	 * illustrate the process for the made-up cipher
	 * ECDHE-ECDSA-AES128-SHA.
	 */
	    {
            1,
            TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
            TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
            SSL_kECDHE|SSL_aECDSA|SSL_AES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_MEDIUM,
            0,
            128,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

	/* Cipher 78 XXX: Another made-up ECC cipher suite that
	 * offers forward secrecy (ECDHE-RSA-AES128-SHA).
	 */
	    {
            1,
            TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA,
            TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA,
            SSL_kECDHE|SSL_aRSA|SSL_AES|SSL_SHA|SSL_TLSV1,
            SSL_NOT_EXP|SSL_MEDIUM,
            0,
            128,
            128,
            SSL_ALL_CIPHERS,
            SSL_ALL_STRENGTHS,
            },

#endif /* !OPENSSL_NO_ECDH */

1364 1365 1366
/* end of list */
	};

1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380
static SSL3_ENC_METHOD SSLv3_enc_data={
	ssl3_enc,
	ssl3_mac,
	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,
	};

1381
static SSL_METHOD SSLv3_data= {
1382
	SSL3_VERSION,
1383 1384 1385 1386 1387 1388 1389 1390 1391 1392
	ssl3_new,
	ssl3_clear,
	ssl3_free,
	ssl_undefined_function,
	ssl_undefined_function,
	ssl3_read,
	ssl3_peek,
	ssl3_write,
	ssl3_shutdown,
	ssl3_renegotiate,
1393
	ssl3_renegotiate_check,
1394 1395 1396 1397 1398 1399 1400 1401 1402
	ssl3_ctrl,
	ssl3_ctx_ctrl,
	ssl3_get_cipher_by_char,
	ssl3_put_cipher_by_char,
	ssl3_pending,
	ssl3_num_ciphers,
	ssl3_get_cipher,
	ssl_bad_method,
	ssl3_default_timeout,
1403
	&SSLv3_enc_data,
1404 1405 1406
	ssl_undefined_function,
	ssl3_callback_ctrl,
	ssl3_ctx_callback_ctrl,
1407 1408
	};

U
Ulf Möller 已提交
1409
static long ssl3_default_timeout(void)
1410 1411 1412 1413 1414 1415
	{
	/* 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 已提交
1416
SSL_METHOD *sslv3_base_method(void)
1417 1418 1419 1420
	{
	return(&SSLv3_data);
	}

U
Ulf Möller 已提交
1421
int ssl3_num_ciphers(void)
1422 1423 1424 1425
	{
	return(SSL3_NUM_CIPHERS);
	}

U
Ulf Möller 已提交
1426
SSL_CIPHER *ssl3_get_cipher(unsigned int u)
1427 1428 1429 1430 1431 1432 1433
	{
	if (u < SSL3_NUM_CIPHERS)
		return(&(ssl3_ciphers[SSL3_NUM_CIPHERS-1-u]));
	else
		return(NULL);
	}

U
Ulf Möller 已提交
1434
int ssl3_pending(SSL *s)
1435
	{
B
Bodo Möller 已提交
1436 1437 1438
	if (s->rstate == SSL_ST_READ_BODY)
		return 0;
	
B
Bodo Möller 已提交
1439
	return (s->s3->rrec.type == SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
1440 1441
	}

U
Ulf Möller 已提交
1442
int ssl3_new(SSL *s)
1443
	{
1444
	SSL3_STATE *s3;
1445

1446
	if ((s3=OPENSSL_malloc(sizeof *s3)) == NULL) goto err;
1447
	memset(s3,0,sizeof *s3);
1448 1449
	EVP_MD_CTX_init(&s3->finish_dgst1);
	EVP_MD_CTX_init(&s3->finish_dgst2);
1450 1451 1452

	s->s3=s3;

1453
	s->method->ssl_clear(s);
1454 1455 1456 1457 1458
	return(1);
err:
	return(0);
	}

U
Ulf Möller 已提交
1459
void ssl3_free(SSL *s)
1460
	{
B
Ben Laurie 已提交
1461 1462 1463
	if(s == NULL)
	    return;

1464 1465
	ssl3_cleanup_key_block(s);
	if (s->s3->rbuf.buf != NULL)
1466
		OPENSSL_free(s->s3->rbuf.buf);
1467
	if (s->s3->wbuf.buf != NULL)
1468
		OPENSSL_free(s->s3->wbuf.buf);
1469
	if (s->s3->rrec.comp != NULL)
1470
		OPENSSL_free(s->s3->rrec.comp);
1471
#ifndef OPENSSL_NO_DH
1472 1473 1474
	if (s->s3->tmp.dh != NULL)
		DH_free(s->s3->tmp.dh);
#endif
B
Bodo Möller 已提交
1475 1476 1477 1478 1479
#ifndef OPENSSL_NO_ECDH
	if (s->s3->tmp.ecdh != NULL)
		EC_KEY_free(s->s3->tmp.ecdh);
#endif

1480
	if (s->s3->tmp.ca_names != NULL)
B
Ben Laurie 已提交
1481
		sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
1482 1483
	EVP_MD_CTX_cleanup(&s->s3->finish_dgst1);
	EVP_MD_CTX_cleanup(&s->s3->finish_dgst2);
1484
	memset(s->s3,0,sizeof *s->s3);
1485
	OPENSSL_free(s->s3);
1486 1487 1488
	s->s3=NULL;
	}

U
Ulf Möller 已提交
1489
void ssl3_clear(SSL *s)
1490 1491
	{
	unsigned char *rp,*wp;
1492
	size_t rlen, wlen;
1493 1494 1495

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

1498 1499
	if (s->s3->rrec.comp != NULL)
		{
1500
		OPENSSL_free(s->s3->rrec.comp);
1501 1502
		s->s3->rrec.comp=NULL;
		}
1503
#ifndef OPENSSL_NO_DH
B
Bodo Möller 已提交
1504 1505 1506
	if (s->s3->tmp.dh != NULL)
		DH_free(s->s3->tmp.dh);
#endif
B
Bodo Möller 已提交
1507 1508 1509 1510
#ifndef OPENSSL_NO_ECDH
	if (s->s3->tmp.ecdh != NULL)
		EC_KEY_free(s->s3->tmp.ecdh);
#endif
1511

1512 1513 1514 1515
	rp = s->s3->rbuf.buf;
	wp = s->s3->wbuf.buf;
	rlen = s->s3->rbuf.len;
 	wlen = s->s3->wbuf.len;
1516

B
Ben Laurie 已提交
1517 1518 1519
	EVP_MD_CTX_cleanup(&s->s3->finish_dgst1);
	EVP_MD_CTX_cleanup(&s->s3->finish_dgst2);

1520
	memset(s->s3,0,sizeof *s->s3);
1521 1522 1523 1524
	s->s3->rbuf.buf = rp;
	s->s3->wbuf.buf = wp;
	s->s3->rbuf.len = rlen;
 	s->s3->wbuf.len = wlen;
1525

1526
	ssl_free_wbio_buffer(s);
1527

1528
	s->packet_length=0;
1529 1530 1531 1532 1533
	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;
1534 1535
	}

1536
long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
1537
	{
1538 1539
	int ret=0;

1540
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
1541
	if (
1542
#ifndef OPENSSL_NO_RSA
1543 1544 1545
	    cmd == SSL_CTRL_SET_TMP_RSA ||
	    cmd == SSL_CTRL_SET_TMP_RSA_CB ||
#endif
1546
#ifndef OPENSSL_NO_DSA
1547 1548 1549 1550 1551
	    cmd == SSL_CTRL_SET_TMP_DH ||
	    cmd == SSL_CTRL_SET_TMP_DH_CB ||
#endif
		0)
		{
1552
		if (!ssl_cert_inst(&s->cert))
1553 1554 1555 1556 1557 1558 1559
		    	{
			SSLerr(SSL_F_SSL3_CTRL, ERR_R_MALLOC_FAILURE);
			return(0);
			}
		}
#endif

1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576
	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;
1577
	case SSL_CTRL_GET_FLAGS:
1578
		ret=(int)(s->s3->flags);
1579
		break;
1580
#ifndef OPENSSL_NO_RSA
1581 1582 1583 1584 1585 1586 1587 1588 1589
	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;
1590 1591
			if (rsa == NULL)
				{
1592 1593
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
				return(ret);
1594 1595 1596
				}
			if ((rsa = RSAPrivateKey_dup(rsa)) == NULL)
				{
1597 1598
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_RSA_LIB);
				return(ret);
1599
				}
1600 1601 1602 1603 1604 1605 1606
			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:
1607
		{
1608 1609
		SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(ret);
1610
		}
1611 1612
		break;
#endif
1613
#ifndef OPENSSL_NO_DH
1614 1615 1616
	case SSL_CTRL_SET_TMP_DH:
		{
			DH *dh = (DH *)parg;
1617 1618
			if (dh == NULL)
				{
1619 1620
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_PASSED_NULL_PARAMETER);
				return(ret);
1621 1622 1623
				}
			if ((dh = DHparams_dup(dh)) == NULL)
				{
1624 1625
				SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB);
				return(ret);
1626 1627 1628 1629 1630 1631 1632 1633 1634 1635
				}
			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);
					}
				}
1636 1637 1638 1639 1640 1641 1642
			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:
1643
		{
1644 1645 1646 1647 1648
		SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(ret);
		}
		break;
#endif
B
Bodo Möller 已提交
1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686
#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 */
1687 1688 1689 1690 1691
	default:
		break;
		}
	return(ret);
	}
1692

1693 1694 1695 1696
long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)())
	{
	int ret=0;

1697
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_RSA)
1698
	if (
1699
#ifndef OPENSSL_NO_RSA
1700 1701
	    cmd == SSL_CTRL_SET_TMP_RSA_CB ||
#endif
1702
#ifndef OPENSSL_NO_DSA
1703 1704 1705 1706 1707
	    cmd == SSL_CTRL_SET_TMP_DH_CB ||
#endif
		0)
		{
		if (!ssl_cert_inst(&s->cert))
1708
			{
1709
			SSLerr(SSL_F_SSL3_CALLBACK_CTRL, ERR_R_MALLOC_FAILURE);
1710 1711 1712 1713 1714 1715 1716
			return(0);
			}
		}
#endif

	switch (cmd)
		{
1717
#ifndef OPENSSL_NO_RSA
1718 1719 1720 1721 1722 1723
	case SSL_CTRL_SET_TMP_RSA_CB:
		{
		s->cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))fp;
		}
		break;
#endif
1724
#ifndef OPENSSL_NO_DH
1725 1726 1727
	case SSL_CTRL_SET_TMP_DH_CB:
		{
		s->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
1728
		}
1729
		break;
B
Bodo Möller 已提交
1730 1731 1732 1733 1734 1735 1736
#endif
#ifndef OPENSSL_NO_ECDH
	case SSL_CTRL_SET_TMP_ECDH_CB:
		{
		s->cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp;
		}
		break;
1737
#endif
1738 1739 1740 1741
	default:
		break;
		}
	return(ret);
1742 1743
	}

1744
long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
1745 1746 1747
	{
	CERT *cert;

1748
	cert=ctx->cert;
1749 1750 1751

	switch (cmd)
		{
1752
#ifndef OPENSSL_NO_RSA
1753 1754 1755 1756 1757 1758 1759 1760
	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);
1761
		/* break; */
1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788
	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);
			}
		}
1789
		/* break; */
1790
	case SSL_CTRL_SET_TMP_RSA_CB:
1791
		{
1792 1793
		SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(0);
1794
		}
1795 1796
		break;
#endif
1797
#ifndef OPENSSL_NO_DH
1798 1799 1800 1801 1802
	case SSL_CTRL_SET_TMP_DH:
		{
		DH *new=NULL,*dh;

		dh=(DH *)parg;
1803
		if ((new=DHparams_dup(dh)) == NULL)
1804 1805
			{
			SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB);
1806
			return 0;
1807
			}
1808
		if (!(ctx->options & SSL_OP_SINGLE_DH_USE))
1809
			{
1810 1811 1812 1813 1814 1815
			if (!DH_generate_key(new))
				{
				SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB);
				DH_free(new);
				return 0;
				}
1816
			}
1817 1818 1819 1820
		if (cert->dh_tmp != NULL)
			DH_free(cert->dh_tmp);
		cert->dh_tmp=new;
		return 1;
1821
		}
1822
		/*break; */
1823
	case SSL_CTRL_SET_TMP_DH_CB:
1824
		{
1825 1826
		SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
		return(0);
1827
		}
1828 1829
		break;
#endif
B
Bodo Möller 已提交
1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870
#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;
			}
		if (!EC_KEY_up_ref((EC_KEY *)parg))
			{
			SSLerr(SSL_F_SSL3_CTRL,ERR_R_ECDH_LIB);
			return 0;
			}
		ecdh = (EC_KEY *)parg;
		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 */
1871
	/* A Thawte special :-) */
1872 1873 1874
	case SSL_CTRL_EXTRA_CHAIN_CERT:
		if (ctx->extra_certs == NULL)
			{
B
Ben Laurie 已提交
1875
			if ((ctx->extra_certs=sk_X509_new_null()) == NULL)
1876 1877
				return(0);
			}
B
Ben Laurie 已提交
1878
		sk_X509_push(ctx->extra_certs,(X509 *)parg);
1879 1880
		break;

1881 1882 1883 1884 1885 1886
	default:
		return(0);
		}
	return(1);
	}

1887 1888 1889 1890 1891 1892 1893 1894
long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)())
	{
	CERT *cert;

	cert=ctx->cert;

	switch (cmd)
		{
1895
#ifndef OPENSSL_NO_RSA
1896 1897 1898 1899 1900 1901
	case SSL_CTRL_SET_TMP_RSA_CB:
		{
		cert->rsa_tmp_cb = (RSA *(*)(SSL *, int, int))fp;
		}
		break;
#endif
1902
#ifndef OPENSSL_NO_DH
1903 1904 1905 1906 1907
	case SSL_CTRL_SET_TMP_DH_CB:
		{
		cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
		}
		break;
B
Bodo Möller 已提交
1908 1909 1910 1911 1912 1913 1914
#endif
#ifndef OPENSSL_NO_ECDH
	case SSL_CTRL_SET_TMP_ECDH_CB:
		{
		cert->ecdh_tmp_cb = (EC_KEY *(*)(SSL *, int, int))fp;
		}
		break;
1915 1916 1917 1918 1919 1920 1921
#endif
	default:
		return(0);
		}
	return(1);
	}

1922 1923
/* This function needs to check if the ciphers required are actually
 * available */
U
Ulf Möller 已提交
1924
SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
1925 1926 1927 1928 1929 1930 1931 1932 1933
	{
	static int init=1;
	static SSL_CIPHER *sorted[SSL3_NUM_CIPHERS];
	SSL_CIPHER c,*cp= &c,**cpp;
	unsigned long id;
	int i;

	if (init)
		{
B
Bodo Möller 已提交
1934
		CRYPTO_w_lock(CRYPTO_LOCK_SSL);
1935

B
Bodo Möller 已提交
1936 1937 1938 1939
		if (init)
			{
			for (i=0; i<SSL3_NUM_CIPHERS; i++)
				sorted[i]= &(ssl3_ciphers[i]);
1940

B
Bodo Möller 已提交
1941 1942 1943
			qsort(sorted,
				SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
				FP_ICC ssl_cipher_ptr_id_cmp);
B
Bodo Möller 已提交
1944

B
Bodo Möller 已提交
1945 1946 1947
			init=0;
			}
		
B
Bodo Möller 已提交
1948
		CRYPTO_w_unlock(CRYPTO_LOCK_SSL);
1949 1950 1951 1952 1953 1954 1955
		}

	id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
	c.id=id;
	cpp=(SSL_CIPHER **)OBJ_bsearch((char *)&cp,
		(char *)sorted,
		SSL3_NUM_CIPHERS,sizeof(SSL_CIPHER *),
D
 
Dr. Stephen Henson 已提交
1956
		FP_ICC ssl_cipher_ptr_id_cmp);
1957 1958 1959 1960 1961 1962
	if ((cpp == NULL) || !(*cpp)->valid)
		return(NULL);
	else
		return(*cpp);
	}

U
Ulf Möller 已提交
1963
int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976
	{
	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);
	}

1977 1978
SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
	     STACK_OF(SSL_CIPHER) *srvr)
1979 1980
	{
	SSL_CIPHER *c,*ret=NULL;
1981
	STACK_OF(SSL_CIPHER) *prio, *allow;
1982 1983 1984 1985
	int i,j,ok;
	CERT *cert;
	unsigned long alg,mask,emask;

1986 1987
	/* Let's see which ciphers we can support */
	cert=s->cert;
1988

1989 1990 1991 1992 1993 1994 1995 1996 1997
#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
1998

B
Ben Laurie 已提交
1999
#ifdef CIPHER_DEBUG
2000 2001
        printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), srvr);
        for(i=0 ; i < sk_SSL_CIPHER_num(srvr) ; ++i)
B
Ben Laurie 已提交
2002
	    {
2003 2004 2005 2006 2007 2008 2009
	    c=sk_SSL_CIPHER_value(srvr,i);
	    printf("%p:%s\n",c,c->name);
	    }
        printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), clnt);
        for(i=0 ; i < sk_SSL_CIPHER_num(clnt) ; ++i)
	    {
	    c=sk_SSL_CIPHER_value(clnt,i);
B
Ben Laurie 已提交
2010 2011 2012 2013
	    printf("%p:%s\n",c,c->name);
	    }
#endif

2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025
	if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE)
	    {
	    prio = srvr;
	    allow = clnt;
	    }
	else
	    {
	    prio = clnt;
	    allow = srvr;
	    }

	for (i=0; i<sk_SSL_CIPHER_num(prio); i++)
2026
		{
2027
		c=sk_SSL_CIPHER_value(prio,i);
2028

2029
		ssl_set_cert_masks(cert,c);
2030 2031 2032
		mask=cert->mask;
		emask=cert->export_mask;
			
2033 2034 2035 2036
#ifdef KSSL_DEBUG
		printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);
#endif    /* KSSL_DEBUG */

2037
		alg=c->algorithms&(SSL_MKEY_MASK|SSL_AUTH_MASK);
2038 2039 2040 2041 2042 2043 2044
#ifndef OPENSSL_NO_KRB5
                if (alg & SSL_KRB5) 
                        {
                        if ( !kssl_keytab_is_available(s->kssl_ctx) )
                            continue;
                        }
#endif /* OPENSSL_NO_KRB5 */
2045
		if (SSL_C_IS_EXPORT(c))
2046 2047 2048
			{
			ok=((alg & emask) == alg)?1:0;
#ifdef CIPHER_DEBUG
B
Ben Laurie 已提交
2049 2050
			printf("%d:[%08lX:%08lX]%p:%s (export)\n",ok,alg,emask,
			       c,c->name);
2051 2052 2053 2054 2055 2056
#endif
			}
		else
			{
			ok=((alg & mask) == alg)?1:0;
#ifdef CIPHER_DEBUG
B
Ben Laurie 已提交
2057 2058
			printf("%d:[%08lX:%08lX]%p:%s\n",ok,alg,mask,c,
			       c->name);
2059 2060 2061 2062
#endif
			}

		if (!ok) continue;
2063
		j=sk_SSL_CIPHER_find(allow,c);
2064 2065
		if (j >= 0)
			{
2066
			ret=sk_SSL_CIPHER_value(allow,j);
2067 2068 2069 2070 2071 2072
			break;
			}
		}
	return(ret);
	}

U
Ulf Möller 已提交
2073
int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
2074 2075 2076 2077 2078 2079
	{
	int ret=0;
	unsigned long alg;

	alg=s->s3->tmp.new_cipher->algorithms;

2080
#ifndef OPENSSL_NO_DH
2081 2082
	if (alg & (SSL_kDHr|SSL_kEDH))
		{
2083
#  ifndef OPENSSL_NO_RSA
2084
		p[ret++]=SSL3_CT_RSA_FIXED_DH;
2085
#  endif
2086
#  ifndef OPENSSL_NO_DSA
2087
		p[ret++]=SSL3_CT_DSS_FIXED_DH;
2088
#  endif
2089
		}
2090 2091
	if ((s->version == SSL3_VERSION) &&
		(alg & (SSL_kEDH|SSL_kDHd|SSL_kDHr)))
2092
		{
2093
#  ifndef OPENSSL_NO_RSA
2094
		p[ret++]=SSL3_CT_RSA_EPHEMERAL_DH;
2095
#  endif
2096
#  ifndef OPENSSL_NO_DSA
2097
		p[ret++]=SSL3_CT_DSS_EPHEMERAL_DH;
2098
#  endif
2099
		}
2100 2101
#endif /* !OPENSSL_NO_DH */
#ifndef OPENSSL_NO_RSA
2102 2103
	p[ret++]=SSL3_CT_RSA_SIGN;
#endif
2104
#ifndef OPENSSL_NO_DSA
2105
	p[ret++]=SSL3_CT_DSS_SIGN;
2106
#endif
B
Bodo Möller 已提交
2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126
#ifndef OPENSSL_NO_ECDH
	/* We should ask for fixed ECDH certificates only
	 * for SSL_kECDH (and not SSL_kECDHE)
	 */
	if ((alg & SSL_kECDH) && (s->version >= TLS1_VERSION))
		{
		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 
	 * so we don't need to check for SSL_kECDH or SSL_kECDHE
	 */
	if (s->version >= TLS1_VERSION)
		{
		p[ret++]=TLS_CT_ECDSA_SIGN;
		}
#endif	
2127 2128 2129
	return(ret);
	}

U
Ulf Möller 已提交
2130
int ssl3_shutdown(SSL *s)
2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144
	{

	/* 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
2145
		ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_CLOSE_NOTIFY);
2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159
#endif
		/* our shutdown alert has been sent now, and if it still needs
	 	 * to be written, s->s3->alert_dispatch will be true */
		}
	else if (s->s3->alert_dispatch)
		{
		/* resend it if not sent */
#if 1
		ssl3_dispatch_alert(s);
#endif
		}
	else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN))
		{
		/* If we are waiting for a close from our peer, we are closed */
B
Bodo Möller 已提交
2160
		ssl3_read_bytes(s,0,NULL,0,0);
2161 2162 2163 2164 2165 2166 2167 2168 2169
		}

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

B
Ben Laurie 已提交
2170
int ssl3_write(SSL *s, const void *buf, int len)
2171 2172 2173 2174 2175 2176 2177 2178 2179 2180
	{
	int ret,n;

#if 0
	if (s->shutdown & SSL_SEND_SHUTDOWN)
		{
		s->rwstate=SSL_NOTHING;
		return(0);
		}
#endif
2181 2182
	clear_sys_error();
	if (s->s3->renegotiate) ssl3_renegotiate_check(s);
2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194

	/* 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 已提交
2195
					     buf,len);
2196 2197 2198 2199 2200 2201 2202 2203 2204 2205
			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;

2206 2207 2208 2209
		/* We have flushed the buffer, so remove it */
		ssl_free_wbio_buffer(s);
		s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;

2210 2211 2212 2213 2214 2215
		ret=s->s3->delay_buf_pop_ret;
		s->s3->delay_buf_pop_ret=0;
		}
	else
		{
		ret=ssl3_write_bytes(s,SSL3_RT_APPLICATION_DATA,
B
Ben Laurie 已提交
2216
				     buf,len);
2217 2218
		if (ret <= 0) return(ret);
		}
2219

2220 2221 2222
	return(ret);
	}

B
Bodo Möller 已提交
2223
static int ssl3_read_internal(SSL *s, void *buf, int len, int peek)
2224
	{
2225 2226 2227 2228 2229
	int ret;
	
	clear_sys_error();
	if (s->s3->renegotiate) ssl3_renegotiate_check(s);
	s->s3->in_read_app_data=1;
B
Bodo Möller 已提交
2230
	ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
2231
	if ((ret == -1) && (s->s3->in_read_app_data == 2))
2232
		{
2233 2234 2235
		/* 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
2236
		 * and thinks that application data makes sense here; so disable
2237
		 * handshake processing and try to read application data again. */
2238
		s->in_handshake++;
B
Bodo Möller 已提交
2239
		ret=ssl3_read_bytes(s,SSL3_RT_APPLICATION_DATA,buf,len,peek);
2240 2241 2242 2243 2244 2245
		s->in_handshake--;
		}
	else
		s->s3->in_read_app_data=0;

	return(ret);
2246 2247
	}

B
Bodo Möller 已提交
2248
int ssl3_read(SSL *s, void *buf, int len)
2249
	{
B
Bodo Möller 已提交
2250 2251
	return ssl3_read_internal(s, buf, len, 0);
	}
2252

2253
int ssl3_peek(SSL *s, void *buf, int len)
B
Bodo Möller 已提交
2254
	{
B
typo  
Bodo Möller 已提交
2255
	return ssl3_read_internal(s, buf, len, 1);
2256 2257
	}

U
Ulf Möller 已提交
2258
int ssl3_renegotiate(SSL *s)
2259 2260 2261 2262 2263 2264 2265
	{
	if (s->handshake_func == NULL)
		return(1);

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

2266
	s->s3->renegotiate=1;
2267 2268 2269
	return(1);
	}

U
Ulf Möller 已提交
2270
int ssl3_renegotiate_check(SSL *s)
2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281
	{
	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 已提交
2282
need to go to SSL_ST_ACCEPT.
2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294
*/
			/* SSL_ST_ACCEPT */
			s->state=SSL_ST_RENEGOTIATE;
			s->s3->renegotiate=0;
			s->s3->num_renegotiations++;
			s->s3->total_renegotiations++;
			ret=1;
			}
		}
	return(ret);
	}