s3_clnt.c 63.3 KB
Newer Older
1
/* ssl/s3_clnt.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.]
 */
58
/* ====================================================================
59
 * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
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 153
#include "ssl_locl.h"
#include "kssl_lcl.h"
154 155 156 157
#include <openssl/buffer.h>
#include <openssl/rand.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
158
#include <openssl/md5.h>
N
make  
Nils Larsch 已提交
159
#ifndef OPENSSL_NO_DH
160
#include <openssl/dh.h>
N
make  
Nils Larsch 已提交
161
#endif
162
#include <openssl/bn.h>
163

164
static const SSL_METHOD *ssl3_get_client_method(int ver);
165
static int ca_dn_cmp(const X509_NAME * const *a,const X509_NAME * const *b);
B
Bodo Möller 已提交
166 167 168 169 170

#ifndef OPENSSL_NO_ECDH
int check_srvr_ecc_cert_and_alg(X509 *x, SSL_CIPHER *cs);
#endif

171
static const SSL_METHOD *ssl3_get_client_method(int ver)
172
	{
173
	if (ver == SSL3_VERSION)
174 175 176 177 178
		return(SSLv3_client_method());
	else
		return(NULL);
	}

179 180 181 182
IMPLEMENT_ssl3_meth_func(SSLv3_client_method,
			ssl_undefined_function,
			ssl3_connect,
			ssl3_get_client_method)
183

U
Ulf Möller 已提交
184
int ssl3_connect(SSL *s)
185
	{
R
Richard Levitte 已提交
186
	BUF_MEM *buf=NULL;
D
Dr. Stephen Henson 已提交
187
	unsigned long Time=(unsigned long)time(NULL),l;
188
	long num1;
B
Ben Laurie 已提交
189
	void (*cb)(const SSL *ssl,int type,int val)=NULL;
190 191 192
	int ret= -1;
	int new_state,state,skip=0;;

193
	RAND_add(&Time,sizeof(Time),0);
194
	ERR_clear_error();
195
	clear_sys_error();
196 197 198 199 200 201 202

	if (s->info_callback != NULL)
		cb=s->info_callback;
	else if (s->ctx->info_callback != NULL)
		cb=s->ctx->info_callback;
	
	s->in_handshake++;
203
	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
204 205 206 207 208 209 210 211 212 213

	for (;;)
		{
		state=s->state;

		switch(s->state)
			{
		case SSL_ST_RENEGOTIATE:
			s->new_session=1;
			s->state=SSL_ST_CONNECT;
214
			s->ctx->stats.sess_connect_renegotiate++;
215 216 217 218 219 220
			/* break */
		case SSL_ST_BEFORE:
		case SSL_ST_CONNECT:
		case SSL_ST_BEFORE|SSL_ST_CONNECT:
		case SSL_ST_OK|SSL_ST_CONNECT:

221
			s->server=0;
222 223
			if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);

224
			if ((s->version & 0xff00 ) != 0x0300)
225
				{
B
Bodo Möller 已提交
226
				SSLerr(SSL_F_SSL3_CONNECT, ERR_R_INTERNAL_ERROR);
227 228 229 230
				ret = -1;
				goto end;
				}
				
231
			/* s->version=SSL3_VERSION; */
232 233 234 235 236 237 238 239 240 241 242 243 244 245 246
			s->type=SSL_ST_CONNECT;

			if (s->init_buf == NULL)
				{
				if ((buf=BUF_MEM_new()) == NULL)
					{
					ret= -1;
					goto end;
					}
				if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
					{
					ret= -1;
					goto end;
					}
				s->init_buf=buf;
R
Richard Levitte 已提交
247
				buf=NULL;
248 249 250 251 252
				}

			if (!ssl3_setup_buffers(s)) { ret= -1; goto end; }

			/* setup buffing BIO */
253
			if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
254 255 256 257 258 259

			/* don't push the buffering BIO quite yet */

			ssl3_init_finished_mac(s);

			s->state=SSL3_ST_CW_CLNT_HELLO_A;
260
			s->ctx->stats.sess_connect++;
261 262 263 264 265 266 267 268 269 270 271 272 273
			s->init_num=0;
			break;

		case SSL3_ST_CW_CLNT_HELLO_A:
		case SSL3_ST_CW_CLNT_HELLO_B:

			s->shutdown=0;
			ret=ssl3_client_hello(s);
			if (ret <= 0) goto end;
			s->state=SSL3_ST_CR_SRVR_HELLO_A;
			s->init_num=0;

			/* turn on buffering for the next lot of output */
274 275
			if (s->bbio != s->wbio)
				s->wbio=BIO_push(s->bbio,s->wbio);
276 277 278 279 280 281 282

			break;

		case SSL3_ST_CR_SRVR_HELLO_A:
		case SSL3_ST_CR_SRVR_HELLO_B:
			ret=ssl3_get_server_hello(s);
			if (ret <= 0) goto end;
283

284 285 286 287 288 289 290 291 292
			if (s->hit)
				s->state=SSL3_ST_CR_FINISHED_A;
			else
				s->state=SSL3_ST_CR_CERT_A;
			s->init_num=0;
			break;

		case SSL3_ST_CR_CERT_A:
		case SSL3_ST_CR_CERT_B:
B
Bodo Möller 已提交
293
			/* Check if it is anon DH/ECDH */
294 295 296
			/* or PSK */
			if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL)
				&& !(s->s3->tmp.new_cipher->algorithms & SSL_kPSK))
297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345
				{
				ret=ssl3_get_server_certificate(s);
				if (ret <= 0) goto end;
				}
			else
				skip=1;
			s->state=SSL3_ST_CR_KEY_EXCH_A;
			s->init_num=0;
			break;

		case SSL3_ST_CR_KEY_EXCH_A:
		case SSL3_ST_CR_KEY_EXCH_B:
			ret=ssl3_get_key_exchange(s);
			if (ret <= 0) goto end;
			s->state=SSL3_ST_CR_CERT_REQ_A;
			s->init_num=0;

			/* at this point we check that we have the
			 * required stuff from the server */
			if (!ssl3_check_cert_and_algorithm(s))
				{
				ret= -1;
				goto end;
				}
			break;

		case SSL3_ST_CR_CERT_REQ_A:
		case SSL3_ST_CR_CERT_REQ_B:
			ret=ssl3_get_certificate_request(s);
			if (ret <= 0) goto end;
			s->state=SSL3_ST_CR_SRVR_DONE_A;
			s->init_num=0;
			break;

		case SSL3_ST_CR_SRVR_DONE_A:
		case SSL3_ST_CR_SRVR_DONE_B:
			ret=ssl3_get_server_done(s);
			if (ret <= 0) goto end;
			if (s->s3->tmp.cert_req)
				s->state=SSL3_ST_CW_CERT_A;
			else
				s->state=SSL3_ST_CW_KEY_EXCH_A;
			s->init_num=0;

			break;

		case SSL3_ST_CW_CERT_A:
		case SSL3_ST_CW_CERT_B:
		case SSL3_ST_CW_CERT_C:
B
Bodo Möller 已提交
346
		case SSL3_ST_CW_CERT_D:
347 348 349 350 351 352 353 354 355 356 357 358 359
			ret=ssl3_send_client_certificate(s);
			if (ret <= 0) goto end;
			s->state=SSL3_ST_CW_KEY_EXCH_A;
			s->init_num=0;
			break;

		case SSL3_ST_CW_KEY_EXCH_A:
		case SSL3_ST_CW_KEY_EXCH_B:
			ret=ssl3_send_client_key_exchange(s);
			if (ret <= 0) goto end;
			l=s->s3->tmp.new_cipher->algorithms;
			/* EAY EAY EAY need to check for DH fix cert
			 * sent back */
360 361
			/* For TLS, cert_req is set to 2, so a cert chain
			 * of nothing is sent, but no verify packet is sent */
B
Bodo Möller 已提交
362 363 364 365 366 367 368
			/* XXX: For now, we do not support client 
			 * authentication in ECDH cipher suites with
			 * ECDH (rather than ECDSA) certificates.
			 * We need to skip the certificate verify 
			 * message when client's ECDH public key is sent 
			 * inside the client certificate.
			 */
369
			if (s->s3->tmp.cert_req == 1)
370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399
				{
				s->state=SSL3_ST_CW_CERT_VRFY_A;
				}
			else
				{
				s->state=SSL3_ST_CW_CHANGE_A;
				s->s3->change_cipher_spec=0;
				}

			s->init_num=0;
			break;

		case SSL3_ST_CW_CERT_VRFY_A:
		case SSL3_ST_CW_CERT_VRFY_B:
			ret=ssl3_send_client_verify(s);
			if (ret <= 0) goto end;
			s->state=SSL3_ST_CW_CHANGE_A;
			s->init_num=0;
			s->s3->change_cipher_spec=0;
			break;

		case SSL3_ST_CW_CHANGE_A:
		case SSL3_ST_CW_CHANGE_B:
			ret=ssl3_send_change_cipher_spec(s,
				SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
			if (ret <= 0) goto end;
			s->state=SSL3_ST_CW_FINISHED_A;
			s->init_num=0;

			s->session->cipher=s->s3->tmp.new_cipher;
400 401 402
#ifdef OPENSSL_NO_COMP
			s->session->compress_meth=0;
#else
403 404 405 406 407
			if (s->s3->tmp.new_compression == NULL)
				s->session->compress_meth=0;
			else
				s->session->compress_meth=
					s->s3->tmp.new_compression->id;
408
#endif
409
			if (!s->method->ssl3_enc->setup_key_block(s))
410 411 412 413 414
				{
				ret= -1;
				goto end;
				}

415
			if (!s->method->ssl3_enc->change_cipher_state(s,
416 417 418 419 420 421 422 423 424 425 426 427
				SSL3_CHANGE_CIPHER_CLIENT_WRITE))
				{
				ret= -1;
				goto end;
				}

			break;

		case SSL3_ST_CW_FINISHED_A:
		case SSL3_ST_CW_FINISHED_B:
			ret=ssl3_send_finished(s,
				SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B,
428 429
				s->method->ssl3_enc->client_finished_label,
				s->method->ssl3_enc->client_finished_label_len);
430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455
			if (ret <= 0) goto end;
			s->state=SSL3_ST_CW_FLUSH;

			/* clear flags */
			s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
			if (s->hit)
				{
				s->s3->tmp.next_state=SSL_ST_OK;
				if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED)
					{
					s->state=SSL_ST_OK;
					s->s3->flags|=SSL3_FLAGS_POP_BUFFER;
					s->s3->delay_buf_pop_ret=0;
					}
				}
			else
				{
				s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
				}
			s->init_num=0;
			break;

		case SSL3_ST_CR_FINISHED_A:
		case SSL3_ST_CR_FINISHED_B:

			ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
456
				SSL3_ST_CR_FINISHED_B);
457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483
			if (ret <= 0) goto end;

			if (s->hit)
				s->state=SSL3_ST_CW_CHANGE_A;
			else
				s->state=SSL_ST_OK;
			s->init_num=0;
			break;

		case SSL3_ST_CW_FLUSH:
			/* number of bytes to be flushed */
			num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL);
			if (num1 > 0)
				{
				s->rwstate=SSL_WRITING;
				num1=BIO_flush(s->wbio);
				if (num1 <= 0) { ret= -1; goto end; }
				s->rwstate=SSL_NOTHING;
				}

			s->state=s->s3->tmp.next_state;
			break;

		case SSL_ST_OK:
			/* clean a few things up */
			ssl3_cleanup_key_block(s);

484
			if (s->init_buf != NULL)
485
				{
486 487
				BUF_MEM_free(s->init_buf);
				s->init_buf=NULL;
488
				}
489 490 491 492 493 494

			/* If we are not 'joining' the last two packets,
			 * remove the buffering now */
			if (!(s->s3->flags & SSL3_FLAGS_POP_BUFFER))
				ssl_free_wbio_buffer(s);
			/* else do it later in ssl3_write */
495 496 497 498 499

			s->init_num=0;
			s->new_session=0;

			ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
500
			if (s->hit) s->ctx->stats.sess_hit++;
501 502 503 504

			ret=1;
			/* s->server=0; */
			s->handshake_func=ssl3_connect;
505
			s->ctx->stats.sess_connect_good++;
506 507 508 509

			if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);

			goto end;
510
			/* break; */
511 512 513 514 515 516 517 518 519 520 521
			
		default:
			SSLerr(SSL_F_SSL3_CONNECT,SSL_R_UNKNOWN_STATE);
			ret= -1;
			goto end;
			/* break; */
			}

		/* did we do anything */
		if (!s->s3->tmp.reuse_message && !skip)
			{
522 523 524 525 526
			if (s->debug)
				{
				if ((ret=BIO_flush(s->wbio)) <= 0)
					goto end;
				}
527 528 529 530 531 532 533 534 535 536 537 538

			if ((cb != NULL) && (s->state != state))
				{
				new_state=s->state;
				s->state=state;
				cb(s,SSL_CB_CONNECT_LOOP,1);
				s->state=new_state;
				}
			}
		skip=0;
		}
end:
539
	s->in_handshake--;
R
Richard Levitte 已提交
540 541
	if (buf != NULL)
		BUF_MEM_free(buf);
542 543 544 545 546 547
	if (cb != NULL)
		cb(s,SSL_CB_CONNECT_EXIT,ret);
	return(ret);
	}


B
Ben Laurie 已提交
548
int ssl3_client_hello(SSL *s)
549 550 551
	{
	unsigned char *buf;
	unsigned char *p,*d;
552
	int i;
553
	unsigned long Time,l;
554 555
#ifndef OPENSSL_NO_COMP
	int j;
556
	SSL_COMP *comp;
557
#endif
558 559 560 561 562

	buf=(unsigned char *)s->init_buf->data;
	if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
		{
		if ((s->session == NULL) ||
563 564
			(s->session->ssl_version != s->version) ||
			(s->session->not_resumable))
565 566 567 568 569 570 571
			{
			if (!ssl_get_new_session(s,0))
				goto err;
			}
		/* else use the pre-loaded session */

		p=s->s3->client_random;
D
Dr. Stephen Henson 已提交
572
		Time=(unsigned long)time(NULL);			/* Time */
573
		l2n(Time,p);
574 575
		if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
			goto err;
576 577 578 579

		/* Do the message type and length last */
		d=p= &(buf[4]);

580 581
		*(p++)=s->version>>8;
		*(p++)=s->version&0xff;
582
		s->client_version=s->version;
583 584 585 586 587 588 589 590 591 592 593 594 595

		/* Random stuff */
		memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
		p+=SSL3_RANDOM_SIZE;

		/* Session ID */
		if (s->new_session)
			i=0;
		else
			i=s->session->session_id_length;
		*(p++)=i;
		if (i != 0)
			{
596
			if (i > (int)sizeof(s->session->session_id))
B
Bodo Möller 已提交
597 598 599 600
				{
				SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
				goto err;
				}
601 602 603 604 605
			memcpy(p,s->session->session_id,i);
			p+=i;
			}
		
		/* Ciphers supported */
606
		i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),0);
607 608 609 610 611 612 613 614
		if (i == 0)
			{
			SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
			goto err;
			}
		s2n(i,p);
		p+=i;

615
		/* COMPRESSION */
616 617 618
#ifdef OPENSSL_NO_COMP
		*(p++)=1;
#else
619 620 621

		if ((s->options & SSL_OP_NO_COMPRESSION)
					|| !s->ctx->comp_methods)
622 623
			j=0;
		else
B
Ben Laurie 已提交
624
			j=sk_SSL_COMP_num(s->ctx->comp_methods);
625 626 627
		*(p++)=1+j;
		for (i=0; i<j; i++)
			{
B
Ben Laurie 已提交
628
			comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
629 630
			*(p++)=comp->id;
			}
631
#endif
632
		*(p++)=0; /* Add the NULL method */
633
#ifndef OPENSSL_NO_TLSEXT
634 635 636 637 638
		if (ssl_prepare_clienthello_tlsext(s) <= 0)
			{
			SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
			goto err;
			}
639 640
		if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
			{
641 642
			SSLerr(SSL_F_SSL3_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
			goto err;
643
			}
644
#endif
645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662
		
		l=(p-d);
		d=buf;
		*(d++)=SSL3_MT_CLIENT_HELLO;
		l2n3(l,d);

		s->state=SSL3_ST_CW_CLNT_HELLO_B;
		/* number of bytes to write */
		s->init_num=p-buf;
		s->init_off=0;
		}

	/* SSL3_ST_CW_CLNT_HELLO_B */
	return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
err:
	return(-1);
	}

B
Ben Laurie 已提交
663
int ssl3_get_server_hello(SSL *s)
664
	{
B
Ben Laurie 已提交
665
	STACK_OF(SSL_CIPHER) *sk;
666 667 668 669 670
	SSL_CIPHER *c;
	unsigned char *p,*d;
	int i,al,ok;
	unsigned int j;
	long n;
671
#ifndef OPENSSL_NO_COMP
672
	SSL_COMP *comp;
673
#endif
674

B
Ben Laurie 已提交
675
	n=s->method->ssl_get_message(s,
676 677
		SSL3_ST_CR_SRVR_HELLO_A,
		SSL3_ST_CR_SRVR_HELLO_B,
B
Ben Laurie 已提交
678
		-1,
679 680 681 682
		300, /* ?? */
		&ok);

	if (!ok) return((int)n);
B
Ben Laurie 已提交
683 684 685 686 687 688 689 690 691 692 693 694 695

	if ( SSL_version(s) == DTLS1_VERSION)
		{
		if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST)
			{
			if ( s->d1->send_cookie == 0)
				{
				s->s3->tmp.reuse_message = 1;
				return 1;
				}
			else /* already sent a cookie */
				{
				al=SSL_AD_UNEXPECTED_MESSAGE;
696
				SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
B
Ben Laurie 已提交
697 698 699 700 701 702 703 704
				goto f_err;
				}
			}
		}
	
	if ( s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO)
		{
		al=SSL_AD_UNEXPECTED_MESSAGE;
705
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
B
Ben Laurie 已提交
706 707 708
		goto f_err;
		}

709
	d=p=(unsigned char *)s->init_msg;
710

711
	if ((p[0] != (s->version>>8)) || (p[1] != (s->version&0xff)))
712 713
		{
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_SSL_VERSION);
714 715 716
		s->version=(s->version&0xff00)|p[1];
		al=SSL_AD_PROTOCOL_VERSION;
		goto f_err;
717 718 719 720 721 722 723 724 725 726 727
		}
	p+=2;

	/* load the server hello data */
	/* load the server random */
	memcpy(s->s3->server_random,p,SSL3_RANDOM_SIZE);
	p+=SSL3_RANDOM_SIZE;

	/* get the session-id */
	j= *(p++);

728
	if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE))
729
		{
730 731 732
		al=SSL_AD_ILLEGAL_PARAMETER;
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SSL3_SESSION_ID_TOO_LONG);
		goto f_err;
733
		}
734

B
Ben Laurie 已提交
735 736 737 738 739 740
	if (j != 0 && j == s->session->session_id_length
	    && memcmp(p,s->session->session_id,j) == 0)
	    {
	    if(s->sid_ctx_length != s->session->sid_ctx_length
	       || memcmp(s->session->sid_ctx,s->sid_ctx,s->sid_ctx_length))
		{
741
		/* actually a client application bug */
B
Ben Laurie 已提交
742 743 744 745 746 747
		al=SSL_AD_ILLEGAL_PARAMETER;
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
		goto f_err;
		}
	    s->hit=1;
	    }
748
	else	/* a miss or crap from the other end */
749
		{
750 751
		/* If we were trying for session-id reuse, make a new
		 * SSL_SESSION so we don't stuff up other people */
752
		s->hit=0;
753 754 755 756 757 758 759 760 761 762
		if (s->session->session_id_length > 0)
			{
			if (!ssl_get_new_session(s,0))
				{
				al=SSL_AD_INTERNAL_ERROR;
				goto f_err;
				}
			}
		s->session->session_id_length=j;
		memcpy(s->session->session_id,p,j); /* j could be 0 */
763 764 765 766 767 768
		}
	p+=j;
	c=ssl_get_cipher_by_char(s,p);
	if (c == NULL)
		{
		/* unknown cipher */
769
		al=SSL_AD_ILLEGAL_PARAMETER;
770 771 772 773 774 775
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNKNOWN_CIPHER_RETURNED);
		goto f_err;
		}
	p+=ssl_put_cipher_by_char(s,NULL,NULL);

	sk=ssl_get_ciphers_by_id(s);
B
Ben Laurie 已提交
776
	i=sk_SSL_CIPHER_find(sk,c);
777 778 779
	if (i < 0)
		{
		/* we did not say we would use this cipher */
780
		al=SSL_AD_ILLEGAL_PARAMETER;
781 782 783 784
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
		goto f_err;
		}

785 786 787 788 789
	/* Depending on the session caching (internal/external), the cipher
	   and/or cipher_id values may not be set. Make sure that
	   cipher_id is set and use it for comparison. */
	if (s->session->cipher)
		s->session->cipher_id = s->session->cipher->id;
790
	if (s->hit && (s->session->cipher_id != c->id))
791
		{
792
		if (!(s->options &
793 794
			SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
			{
795
			al=SSL_AD_ILLEGAL_PARAMETER;
796 797 798 799 800 801 802
			SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
			goto f_err;
			}
		}
	s->s3->tmp.new_cipher=c;

	/* lets get the compression algorithm */
803
	/* COMPRESSION */
804 805 806 807 808 809 810 811
#ifdef OPENSSL_NO_COMP
	if (*(p++) != 0)
		{
		al=SSL_AD_ILLEGAL_PARAMETER;
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
		goto f_err;
		}
#else
812
	j= *(p++);
813
	if ((j == 0) || (s->options & SSL_OP_NO_COMPRESSION))
814 815 816 817 818
		comp=NULL;
	else
		comp=ssl3_comp_find(s->ctx->comp_methods,j);
	
	if ((j != 0) && (comp == NULL))
819
		{
820
		al=SSL_AD_ILLEGAL_PARAMETER;
821 822 823
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
		goto f_err;
		}
824 825 826 827
	else
		{
		s->s3->tmp.new_compression=comp;
		}
828
#endif
829 830 831
#ifndef OPENSSL_NO_TLSEXT
	/* TLS extensions*/
	if (s->version > SSL3_VERSION)
832 833 834 835
		{
		if (!ssl_parse_serverhello_tlsext(s,&p,d,n, &al))
			{
			/* 'al' set by ssl_parse_serverhello_tlsext */
836
			SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_PARSE_TLSEXT);
837
			goto f_err; 
838
			}
839
		if (ssl_check_serverhello_tlsext(s) <= 0)
840
			{
841
			SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SERVERHELLO_TLSEXT);
842 843
				goto err;
			}
844 845
		}
#endif
846 847 848 849

	if (p != (d+n))
		{
		/* wrong packet length */
850
		al=SSL_AD_DECODE_ERROR;
851 852 853 854 855 856 857 858 859 860 861
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH);
		goto err;
		}

	return(1);
f_err:
	ssl3_send_alert(s,SSL3_AL_FATAL,al);
err:
	return(-1);
	}

B
Ben Laurie 已提交
862
int ssl3_get_server_certificate(SSL *s)
863 864 865 866
	{
	int al,i,ok,ret= -1;
	unsigned long n,nc,llen,l;
	X509 *x=NULL;
867 868
	const unsigned char *q,*p;
	unsigned char *d;
B
Ben Laurie 已提交
869
	STACK_OF(X509) *sk=NULL;
870
	SESS_CERT *sc;
871
	EVP_PKEY *pkey=NULL;
872
	int need_cert = 1; /* VRS: 0=> will allow null cert if auth == KRB5 */
873

B
Ben Laurie 已提交
874
	n=s->method->ssl_get_message(s,
875 876 877
		SSL3_ST_CR_CERT_A,
		SSL3_ST_CR_CERT_B,
		-1,
878
		s->max_cert_list,
879 880 881 882 883 884 885 886 887 888 889 890
		&ok);

	if (!ok) return((int)n);

	if (s->s3->tmp.message_type == SSL3_MT_SERVER_KEY_EXCHANGE)
		{
		s->s3->tmp.reuse_message=1;
		return(1);
		}

	if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE)
		{
891
		al=SSL_AD_UNEXPECTED_MESSAGE;
892 893 894
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_BAD_MESSAGE_TYPE);
		goto f_err;
		}
895
	p=d=(unsigned char *)s->init_msg;
896

B
Ben Laurie 已提交
897
	if ((sk=sk_X509_new_null()) == NULL)
898 899 900 901 902 903 904 905
		{
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
		goto err;
		}

	n2l3(p,llen);
	if (llen+3 != n)
		{
906
		al=SSL_AD_DECODE_ERROR;
907 908 909 910 911 912 913 914
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_LENGTH_MISMATCH);
		goto f_err;
		}
	for (nc=0; nc<llen; )
		{
		n2l3(p,l);
		if ((l+nc+3) > llen)
			{
915
			al=SSL_AD_DECODE_ERROR;
916 917 918 919 920 921 922 923
			SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
			goto f_err;
			}

		q=p;
		x=d2i_X509(NULL,&q,l);
		if (x == NULL)
			{
924
			al=SSL_AD_BAD_CERTIFICATE;
925 926 927 928 929
			SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_ASN1_LIB);
			goto f_err;
			}
		if (q != (p+l))
			{
930
			al=SSL_AD_DECODE_ERROR;
931 932 933
			SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
			goto f_err;
			}
B
Ben Laurie 已提交
934
		if (!sk_X509_push(sk,x))
935 936 937 938 939 940 941 942 943 944
			{
			SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
			goto err;
			}
		x=NULL;
		nc+=l+3;
		p=q;
		}

	i=ssl_verify_cert_chain(s,sk);
945 946
	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
#ifndef OPENSSL_NO_KRB5
947 948
	        && (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
	        != (SSL_aKRB5|SSL_kKRB5)
949
#endif /* OPENSSL_NO_KRB5 */
950
	        )
951 952 953 954 955
		{
		al=ssl_verify_alarm_type(s->verify_result);
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
		goto f_err; 
		}
956
	ERR_clear_error(); /* but we keep s->verify_result */
957

958 959
	sc=ssl_sess_cert_new();
	if (sc == NULL) goto err;
960

961 962
	if (s->session->sess_cert) ssl_sess_cert_free(s->session->sess_cert);
	s->session->sess_cert=sc;
963

964
	sc->cert_chain=sk;
965 966
	/* Inconsistency alert: cert_chain does include the peer's
	 * certificate, which we don't include in s3_srvr.c */
B
Ben Laurie 已提交
967
	x=sk_X509_value(sk,0);
968
	sk=NULL;
969
 	/* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
970 971 972

	pkey=X509_get_pubkey(x);

973 974 975 976
	/* VRS: allow null cert if auth == KRB5 */
	need_cert =	((s->s3->tmp.new_cipher->algorithms
	                 & (SSL_MKEY_MASK|SSL_AUTH_MASK))
	                 == (SSL_aKRB5|SSL_kKRB5))? 0: 1;
977 978 979 980 981

#ifdef KSSL_DEBUG
	printf("pkey,x = %p, %p\n", pkey,x);
	printf("ssl_cert_type(x,pkey) = %d\n", ssl_cert_type(x,pkey));
	printf("cipher, alg, nc = %s, %lx, %d\n", s->s3->tmp.new_cipher->name,
982
	        s->s3->tmp.new_cipher->algorithms, need_cert);
983 984
#endif    /* KSSL_DEBUG */

985
	if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey)))
986 987 988
		{
		x=NULL;
		al=SSL3_AL_FATAL;
989 990
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
			SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
991 992 993 994
		goto f_err;
		}

	i=ssl_cert_type(x,pkey);
995
	if (need_cert && i < 0)
996 997 998
		{
		x=NULL;
		al=SSL3_AL_FATAL;
999 1000
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
			SSL_R_UNKNOWN_CERTIFICATE_TYPE);
1001 1002 1003
		goto f_err;
		}

1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028
	if (need_cert)
		{
		sc->peer_cert_type=i;
		CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
		/* Why would the following ever happen?
		 * We just created sc a couple of lines ago. */
		if (sc->peer_pkeys[i].x509 != NULL)
			X509_free(sc->peer_pkeys[i].x509);
		sc->peer_pkeys[i].x509=x;
		sc->peer_key= &(sc->peer_pkeys[i]);

		if (s->session->peer != NULL)
			X509_free(s->session->peer);
		CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
		s->session->peer=x;
		}
	else
		{
		sc->peer_cert_type=i;
		sc->peer_key= NULL;

		if (s->session->peer != NULL)
			X509_free(s->session->peer);
		s->session->peer=NULL;
		}
1029
	s->session->verify_result = s->verify_result;
1030 1031 1032 1033 1034 1035 1036 1037 1038 1039

	x=NULL;
	ret=1;

	if (0)
		{
f_err:
		ssl3_send_alert(s,SSL3_AL_FATAL,al);
		}
err:
1040 1041
	EVP_PKEY_free(pkey);
	X509_free(x);
B
Ben Laurie 已提交
1042
	sk_X509_pop_free(sk,X509_free);
1043 1044 1045
	return(ret);
	}

B
Ben Laurie 已提交
1046
int ssl3_get_key_exchange(SSL *s)
1047
	{
1048
#ifndef OPENSSL_NO_RSA
1049 1050 1051 1052 1053 1054 1055
	unsigned char *q,md_buf[EVP_MAX_MD_SIZE*2];
#endif
	EVP_MD_CTX md_ctx;
	unsigned char *param,*p;
	int al,i,j,param_len,ok;
	long n,alg;
	EVP_PKEY *pkey=NULL;
1056
#ifndef OPENSSL_NO_RSA
1057
	RSA *rsa=NULL;
1058
#endif
1059
#ifndef OPENSSL_NO_DH
1060
	DH *dh=NULL;
1061
#endif
B
Bodo Möller 已提交
1062 1063 1064 1065 1066 1067 1068
#ifndef OPENSSL_NO_ECDH
	EC_KEY *ecdh = NULL;
	BN_CTX *bn_ctx = NULL;
	EC_POINT *srvr_ecpoint = NULL;
	int curve_nid = 0;
	int encoded_pt_len = 0;
#endif
1069

1070 1071
	/* use same message size as in ssl3_get_certificate_request()
	 * as ServerKeyExchange message may be skipped */
B
Ben Laurie 已提交
1072
	n=s->method->ssl_get_message(s,
1073 1074 1075
		SSL3_ST_CR_KEY_EXCH_A,
		SSL3_ST_CR_KEY_EXCH_B,
		-1,
1076
		s->max_cert_list,
1077 1078 1079 1080 1081
		&ok);
	if (!ok) return((int)n);

	if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE)
		{
1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094
#ifndef OPENSSL_NO_PSK
		/* In plain PSK ciphersuite, ServerKeyExchange can be
		   omitted if no identity hint is sent. Set
		   session->sess_cert anyway to avoid problems
		   later.*/
                if (s->s3->tmp.new_cipher->algorithms & SSL_kPSK)
			{
			s->session->sess_cert=ssl_sess_cert_new();
			if (s->ctx->psk_identity_hint)
				OPENSSL_free(s->ctx->psk_identity_hint);
			s->ctx->psk_identity_hint = NULL;
			}
#endif
1095 1096 1097 1098
		s->s3->tmp.reuse_message=1;
		return(1);
		}

1099
	param=p=(unsigned char *)s->init_msg;
1100
	if (s->session->sess_cert != NULL)
1101
		{
1102
#ifndef OPENSSL_NO_RSA
1103
		if (s->session->sess_cert->peer_rsa_tmp != NULL)
1104
			{
1105 1106
			RSA_free(s->session->sess_cert->peer_rsa_tmp);
			s->session->sess_cert->peer_rsa_tmp=NULL;
1107 1108
			}
#endif
1109
#ifndef OPENSSL_NO_DH
1110
		if (s->session->sess_cert->peer_dh_tmp)
1111
			{
1112 1113
			DH_free(s->session->sess_cert->peer_dh_tmp);
			s->session->sess_cert->peer_dh_tmp=NULL;
1114
			}
B
Bodo Möller 已提交
1115 1116 1117 1118 1119 1120 1121
#endif
#ifndef OPENSSL_NO_ECDH
		if (s->session->sess_cert->peer_ecdh_tmp)
			{
			EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp);
			s->session->sess_cert->peer_ecdh_tmp=NULL;
			}
1122 1123 1124 1125
#endif
		}
	else
		{
1126
		s->session->sess_cert=ssl_sess_cert_new();
1127 1128 1129 1130
		}

	param_len=0;
	alg=s->s3->tmp.new_cipher->algorithms;
1131
	EVP_MD_CTX_init(&md_ctx);
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
#ifndef OPENSSL_NO_PSK
	if (alg & SSL_kPSK)
	        {
		char tmp_id_hint[PSK_MAX_IDENTITY_LEN+1];

		al=SSL_AD_HANDSHAKE_FAILURE;
		n2s(p,i);
		param_len=i+2;
		/* Store PSK identity hint for later use, hint is used
		 * in ssl3_send_client_key_exchange.  Assume that the
		 * maximum length of a PSK identity hint can be as
		 * long as the maximum length of a PSK identity. */
		if (i > PSK_MAX_IDENTITY_LEN)
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
				SSL_R_DATA_LENGTH_TOO_LONG);
			goto f_err;
			}
		if (param_len > n)
			{
			al=SSL_AD_DECODE_ERROR;
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
				SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH);
			goto f_err;
			}
		/* If received PSK identity hint contains NULL
		 * characters, the hint is truncated from the first
		 * NULL. p may not be ending with NULL, so create a
		 * NULL-terminated string. */
		memcpy(tmp_id_hint, p, i);
		memset(tmp_id_hint+i, 0, PSK_MAX_IDENTITY_LEN+1-i);
		if (s->ctx->psk_identity_hint != NULL)
			OPENSSL_free(s->ctx->psk_identity_hint);
		s->ctx->psk_identity_hint = BUF_strdup(tmp_id_hint);
		if (s->ctx->psk_identity_hint == NULL)
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
			goto f_err;
			}           

		p+=i;
		n-=param_len;
		}
	else
#endif /* !OPENSSL_NO_PSK */
1178
#ifndef OPENSSL_NO_RSA
1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189
	if (alg & SSL_kRSA)
		{
		if ((rsa=RSA_new()) == NULL)
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
			goto err;
			}
		n2s(p,i);
		param_len=i+2;
		if (param_len > n)
			{
1190
			al=SSL_AD_DECODE_ERROR;
1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_MODULUS_LENGTH);
			goto f_err;
			}
		if (!(rsa->n=BN_bin2bn(p,i,rsa->n)))
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
			goto err;
			}
		p+=i;

		n2s(p,i);
		param_len+=i+2;
		if (param_len > n)
			{
1205
			al=SSL_AD_DECODE_ERROR;
1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_E_LENGTH);
			goto f_err;
			}
		if (!(rsa->e=BN_bin2bn(p,i,rsa->e)))
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
			goto err;
			}
		p+=i;
		n-=param_len;

		/* this should be because we are using an export cipher */
		if (alg & SSL_aRSA)
1219
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
1220 1221
		else
			{
B
Bodo Möller 已提交
1222
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1223 1224
			goto err;
			}
1225
		s->session->sess_cert->peer_rsa_tmp=rsa;
1226
		rsa=NULL;
1227
		}
1228
#else /* OPENSSL_NO_RSA */
1229 1230
	if (0)
		;
1231
#endif
1232
#ifndef OPENSSL_NO_DH
1233
	else if (alg & SSL_kEDH)
1234 1235 1236 1237 1238 1239 1240 1241 1242 1243
		{
		if ((dh=DH_new()) == NULL)
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_DH_LIB);
			goto err;
			}
		n2s(p,i);
		param_len=i+2;
		if (param_len > n)
			{
1244
			al=SSL_AD_DECODE_ERROR;
1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_P_LENGTH);
			goto f_err;
			}
		if (!(dh->p=BN_bin2bn(p,i,NULL)))
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
			goto err;
			}
		p+=i;

		n2s(p,i);
		param_len+=i+2;
		if (param_len > n)
			{
1259
			al=SSL_AD_DECODE_ERROR;
1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_G_LENGTH);
			goto f_err;
			}
		if (!(dh->g=BN_bin2bn(p,i,NULL)))
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
			goto err;
			}
		p+=i;

		n2s(p,i);
		param_len+=i+2;
		if (param_len > n)
			{
1274
			al=SSL_AD_DECODE_ERROR;
1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_PUB_KEY_LENGTH);
			goto f_err;
			}
		if (!(dh->pub_key=BN_bin2bn(p,i,NULL)))
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
			goto err;
			}
		p+=i;
		n-=param_len;

1286
#ifndef OPENSSL_NO_RSA
1287
		if (alg & SSL_aRSA)
1288
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
1289 1290 1291
#else
		if (0)
			;
1292
#endif
1293
#ifndef OPENSSL_NO_DSA
1294
		else if (alg & SSL_aDSS)
1295
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
1296 1297 1298
#endif
		/* else anonymous DH, so no certificate or pkey. */

1299
		s->session->sess_cert->peer_dh_tmp=dh;
1300
		dh=NULL;
1301 1302 1303
		}
	else if ((alg & SSL_kDHr) || (alg & SSL_kDHd))
		{
1304
		al=SSL_AD_ILLEGAL_PARAMETER;
1305 1306 1307
		SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
		goto f_err;
		}
1308
#endif /* !OPENSSL_NO_DH */
B
Bodo Möller 已提交
1309 1310

#ifndef OPENSSL_NO_ECDH
1311
	else if (alg & SSL_kEECDH)
B
Bodo Möller 已提交
1312
		{
N
Nils Larsch 已提交
1313 1314 1315
		EC_GROUP *ngroup;
		const EC_GROUP *group;

B
Bodo Möller 已提交
1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328
		if ((ecdh=EC_KEY_new()) == NULL)
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
			goto err;
			}

		/* Extract elliptic curve parameters and the
		 * server's ephemeral ECDH public key.
		 * Keep accumulating lengths of various components in
		 * param_len and make sure it never exceeds n.
		 */

		/* XXX: For now we only support named (not generic) curves
B
Bodo Möller 已提交
1329
		 * and the ECParameters in this case is just three bytes.
B
Bodo Möller 已提交
1330
		 */
B
Bodo Möller 已提交
1331
		param_len=3;
B
Bodo Möller 已提交
1332 1333
		if ((param_len > n) ||
		    (*p != NAMED_CURVE_TYPE) || 
1334
		    ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) 
B
Bodo Möller 已提交
1335 1336 1337 1338 1339 1340
			{
			al=SSL_AD_INTERNAL_ERROR;
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
			goto f_err;
			}

N
Nils Larsch 已提交
1341 1342 1343 1344 1345 1346 1347
		ngroup = EC_GROUP_new_by_curve_name(curve_nid);
		if (ngroup == NULL)
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
			goto err;
			}
		if (EC_KEY_set_group(ecdh, ngroup) == 0)
B
Bodo Möller 已提交
1348 1349 1350 1351
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
			goto err;
			}
N
Nils Larsch 已提交
1352 1353 1354
		EC_GROUP_free(ngroup);

		group = EC_KEY_get0_group(ecdh);
B
Bodo Möller 已提交
1355 1356

		if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
N
Nils Larsch 已提交
1357
		    (EC_GROUP_get_degree(group) > 163))
B
Bodo Möller 已提交
1358 1359 1360 1361 1362 1363
			{
			al=SSL_AD_EXPORT_RESTRICTION;
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
			goto f_err;
			}

B
Bodo Möller 已提交
1364
		p+=3;
B
Bodo Möller 已提交
1365 1366

		/* Next, get the encoded ECPoint */
N
Nils Larsch 已提交
1367
		if (((srvr_ecpoint = EC_POINT_new(group)) == NULL) ||
B
Bodo Möller 已提交
1368 1369 1370 1371 1372 1373 1374 1375 1376 1377
		    ((bn_ctx = BN_CTX_new()) == NULL))
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
			goto err;
			}

		encoded_pt_len = *p;  /* length of encoded point */
		p+=1;
		param_len += (1 + encoded_pt_len);
		if ((param_len > n) ||
N
Nils Larsch 已提交
1378
		    (EC_POINT_oct2point(group, srvr_ecpoint, 
B
Bodo Möller 已提交
1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402
			p, encoded_pt_len, bn_ctx) == 0))
			{
			al=SSL_AD_DECODE_ERROR;
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_ECPOINT);
			goto f_err;
			}

		n-=param_len;
		p+=encoded_pt_len;

		/* The ECC/TLS specification does not mention
		 * the use of DSA to sign ECParameters in the server
		 * key exchange message. We do support RSA and ECDSA.
		 */
		if (0) ;
#ifndef OPENSSL_NO_RSA
		else if (alg & SSL_aRSA)
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
#endif
#ifndef OPENSSL_NO_ECDSA
		else if (alg & SSL_aECDSA)
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
#endif
		/* else anonymous ECDH, so no certificate or pkey. */
N
Nils Larsch 已提交
1403
		EC_KEY_set_public_key(ecdh, srvr_ecpoint);
B
Bodo Möller 已提交
1404 1405 1406
		s->session->sess_cert->peer_ecdh_tmp=ecdh;
		ecdh=NULL;
		BN_CTX_free(bn_ctx);
N
Nils Larsch 已提交
1407
		EC_POINT_free(srvr_ecpoint);
B
Bodo Möller 已提交
1408 1409
		srvr_ecpoint = NULL;
		}
1410
	else if (alg)
B
Bodo Möller 已提交
1411 1412 1413 1414 1415 1416
		{
		al=SSL_AD_UNEXPECTED_MESSAGE;
		SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
		goto f_err;
		}
#endif /* !OPENSSL_NO_ECDH */
1417

1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430

	/* p points to the next byte, there are 'n' bytes left */

	/* if it was signed, check the signature */
	if (pkey != NULL)
		{
		n2s(p,i);
		n-=2;
		j=EVP_PKEY_size(pkey);

		if ((i != n) || (n > j) || (n <= 0))
			{
			/* wrong packet length */
1431
			al=SSL_AD_DECODE_ERROR;
1432
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_LENGTH);
1433
			goto f_err;
1434 1435
			}

1436
#ifndef OPENSSL_NO_RSA
1437 1438 1439 1440 1441 1442 1443 1444
		if (pkey->type == EVP_PKEY_RSA)
			{
			int num;

			j=0;
			q=md_buf;
			for (num=2; num > 0; num--)
				{
D
 
Dr. Stephen Henson 已提交
1445 1446
				EVP_DigestInit_ex(&md_ctx,(num == 2)
					?s->ctx->md5:s->ctx->sha1, NULL);
1447 1448 1449
				EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
				EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
				EVP_DigestUpdate(&md_ctx,param,param_len);
D
 
Dr. Stephen Henson 已提交
1450
				EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i);
1451 1452 1453
				q+=i;
				j+=i;
				}
1454 1455 1456
			i=RSA_verify(NID_md5_sha1, md_buf, j, p, n,
								pkey->pkey.rsa);
			if (i < 0)
1457
				{
1458
				al=SSL_AD_DECRYPT_ERROR;
1459 1460 1461
				SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
				goto f_err;
				}
1462
			if (i == 0)
1463 1464
				{
				/* bad signature */
1465
				al=SSL_AD_DECRYPT_ERROR;
1466 1467 1468 1469 1470 1471
				SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
				goto f_err;
				}
			}
		else
#endif
1472
#ifndef OPENSSL_NO_DSA
1473 1474 1475
			if (pkey->type == EVP_PKEY_DSA)
			{
			/* lets do DSS */
D
 
Dr. Stephen Henson 已提交
1476
			EVP_VerifyInit_ex(&md_ctx,EVP_dss1(), NULL);
1477 1478 1479 1480 1481 1482
			EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
			EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
			EVP_VerifyUpdate(&md_ctx,param,param_len);
			if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
				{
				/* bad signature */
1483
				al=SSL_AD_DECRYPT_ERROR;
1484 1485 1486 1487 1488
				SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
				goto f_err;
				}
			}
		else
B
Bodo Möller 已提交
1489 1490
#endif
#ifndef OPENSSL_NO_ECDSA
1491
			if (pkey->type == EVP_PKEY_EC)
B
Bodo Möller 已提交
1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506
			{
			/* let's do ECDSA */
			EVP_VerifyInit_ex(&md_ctx,EVP_ecdsa(), NULL);
			EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
			EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
			EVP_VerifyUpdate(&md_ctx,param,param_len);
			if (!EVP_VerifyFinal(&md_ctx,p,(int)n,pkey))
				{
				/* bad signature */
				al=SSL_AD_DECRYPT_ERROR;
				SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
				goto f_err;
				}
			}
		else
1507 1508
#endif
			{
B
Bodo Möller 已提交
1509
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1510 1511 1512 1513 1514
			goto err;
			}
		}
	else
		{
1515 1516
		if (!(alg & SSL_aNULL) && !(alg & SSL_kPSK))
			/* aNULL or kPSK do not need public keys */
1517
			{
B
Bodo Möller 已提交
1518
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1519 1520
			goto err;
			}
1521
		/* still data left over */
1522 1523
		if (n != 0)
			{
1524
			al=SSL_AD_DECODE_ERROR;
1525 1526 1527 1528
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_EXTRA_DATA_IN_MESSAGE);
			goto f_err;
			}
		}
1529
	EVP_PKEY_free(pkey);
1530
	EVP_MD_CTX_cleanup(&md_ctx);
1531 1532 1533 1534
	return(1);
f_err:
	ssl3_send_alert(s,SSL3_AL_FATAL,al);
err:
1535
	EVP_PKEY_free(pkey);
1536
#ifndef OPENSSL_NO_RSA
1537 1538 1539
	if (rsa != NULL)
		RSA_free(rsa);
#endif
1540
#ifndef OPENSSL_NO_DH
1541 1542
	if (dh != NULL)
		DH_free(dh);
B
Bodo Möller 已提交
1543 1544 1545 1546 1547 1548
#endif
#ifndef OPENSSL_NO_ECDH
	BN_CTX_free(bn_ctx);
	EC_POINT_free(srvr_ecpoint);
	if (ecdh != NULL)
		EC_KEY_free(ecdh);
1549
#endif
1550
	EVP_MD_CTX_cleanup(&md_ctx);
1551 1552 1553
	return(-1);
	}

B
Ben Laurie 已提交
1554
int ssl3_get_certificate_request(SSL *s)
1555 1556
	{
	int ok,ret=0;
1557 1558
	unsigned long n,nc,l;
	unsigned int llen,ctype_num,i;
1559
	X509_NAME *xn=NULL;
1560 1561
	const unsigned char *p,*q;
	unsigned char *d;
B
Ben Laurie 已提交
1562
	STACK_OF(X509_NAME) *ca_sk=NULL;
1563

B
Ben Laurie 已提交
1564
	n=s->method->ssl_get_message(s,
1565 1566 1567
		SSL3_ST_CR_CERT_REQ_A,
		SSL3_ST_CR_CERT_REQ_B,
		-1,
1568
		s->max_cert_list,
1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582
		&ok);

	if (!ok) return((int)n);

	s->s3->tmp.cert_req=0;

	if (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)
		{
		s->s3->tmp.reuse_message=1;
		return(1);
		}

	if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_REQUEST)
		{
1583
		ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
1584 1585 1586 1587
		SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_WRONG_MESSAGE_TYPE);
		goto err;
		}

1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599
	/* TLS does not like anon-DH with client cert */
	if (s->version > SSL3_VERSION)
		{
		l=s->s3->tmp.new_cipher->algorithms;
		if (l & SSL_aNULL)
			{
			ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
			SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER);
			goto err;
			}
		}

1600
	p=d=(unsigned char *)s->init_msg;
1601

B
Ben Laurie 已提交
1602
	if ((ca_sk=sk_X509_NAME_new(ca_dn_cmp)) == NULL)
1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617
		{
		SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
		goto err;
		}

	/* get the certificate types */
	ctype_num= *(p++);
	if (ctype_num > SSL3_CT_NUMBER)
		ctype_num=SSL3_CT_NUMBER;
	for (i=0; i<ctype_num; i++)
		s->s3->tmp.ctype[i]= p[i];
	p+=ctype_num;

	/* get the CA RDNs */
	n2s(p,llen);
1618 1619 1620 1621 1622 1623 1624 1625 1626
#if 0
{
FILE *out;
out=fopen("/tmp/vsign.der","w");
fwrite(p,1,llen,out);
fclose(out);
}
#endif

1627 1628
	if ((llen+ctype_num+2+1) != n)
		{
1629
		ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1630 1631 1632 1633 1634 1635 1636 1637 1638
		SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_LENGTH_MISMATCH);
		goto err;
		}

	for (nc=0; nc<llen; )
		{
		n2s(p,l);
		if ((l+nc+2) > llen)
			{
1639
			if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
1640
				goto cont; /* netscape bugs */
1641
			ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1642 1643 1644 1645 1646 1647 1648 1649
			SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_TOO_LONG);
			goto err;
			}

		q=p;

		if ((xn=d2i_X509_NAME(NULL,&q,l)) == NULL)
			{
U
Ulf Möller 已提交
1650
			/* If netscape tolerance is on, ignore errors */
1651
			if (s->options & SSL_OP_NETSCAPE_CA_DN_BUG)
1652 1653 1654
				goto cont;
			else
				{
1655
				ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1656 1657 1658 1659 1660 1661 1662
				SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_ASN1_LIB);
				goto err;
				}
			}

		if (q != (p+l))
			{
1663
			ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1664 1665 1666
			SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_LENGTH_MISMATCH);
			goto err;
			}
B
Ben Laurie 已提交
1667
		if (!sk_X509_NAME_push(ca_sk,xn))
1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682
			{
			SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
			goto err;
			}

		p+=l;
		nc+=l+2;
		}

	if (0)
		{
cont:
		ERR_clear_error();
		}

U
Ulf Möller 已提交
1683
	/* we should setup a certificate to return.... */
1684 1685 1686
	s->s3->tmp.cert_req=1;
	s->s3->tmp.ctype_num=ctype_num;
	if (s->s3->tmp.ca_names != NULL)
B
Ben Laurie 已提交
1687
		sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
1688 1689 1690 1691 1692
	s->s3->tmp.ca_names=ca_sk;
	ca_sk=NULL;

	ret=1;
err:
B
Ben Laurie 已提交
1693
	if (ca_sk != NULL) sk_X509_NAME_pop_free(ca_sk,X509_NAME_free);
1694 1695 1696
	return(ret);
	}

1697
static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
1698 1699 1700 1701
	{
	return(X509_NAME_cmp(*a,*b));
	}

B
Ben Laurie 已提交
1702
int ssl3_get_server_done(SSL *s)
1703 1704 1705 1706
	{
	int ok,ret=0;
	long n;

B
Ben Laurie 已提交
1707
	n=s->method->ssl_get_message(s,
1708 1709 1710 1711 1712 1713 1714 1715 1716 1717
		SSL3_ST_CR_SRVR_DONE_A,
		SSL3_ST_CR_SRVR_DONE_B,
		SSL3_MT_SERVER_DONE,
		30, /* should be very small, like 0 :-) */
		&ok);

	if (!ok) return((int)n);
	if (n > 0)
		{
		/* should contain no data */
1718
		ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1719
		SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
1720
		return -1;
1721 1722 1723 1724 1725
		}
	ret=1;
	return(ret);
	}

1726

B
Ben Laurie 已提交
1727
int ssl3_send_client_key_exchange(SSL *s)
1728
	{
1729
	unsigned char *p,*d;
1730 1731
	int n;
	unsigned long l;
1732
#ifndef OPENSSL_NO_RSA
1733
	unsigned char *q;
1734
	EVP_PKEY *pkey=NULL;
1735
#endif
1736
#ifndef OPENSSL_NO_KRB5
1737
	KSSL_ERR kssl_err;
1738
#endif /* OPENSSL_NO_KRB5 */
B
Bodo Möller 已提交
1739 1740
#ifndef OPENSSL_NO_ECDH
	EC_KEY *clnt_ecdh = NULL;
N
Nils Larsch 已提交
1741
	const EC_POINT *srvr_ecpoint = NULL;
B
Bodo Möller 已提交
1742 1743 1744 1745 1746
	EVP_PKEY *srvr_pub_pkey = NULL;
	unsigned char *encodedPoint = NULL;
	int encoded_pt_len = 0;
	BN_CTX * bn_ctx = NULL;
#endif
1747 1748 1749 1750 1751 1752 1753 1754

	if (s->state == SSL3_ST_CW_KEY_EXCH_A)
		{
		d=(unsigned char *)s->init_buf->data;
		p= &(d[4]);

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

1755 1756
		/* Fool emacs indentation */
		if (0) {}
1757
#ifndef OPENSSL_NO_RSA
1758
		else if (l & SSL_kRSA)
1759 1760
			{
			RSA *rsa;
1761
			unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
1762

1763 1764
			if (s->session->sess_cert->peer_rsa_tmp != NULL)
				rsa=s->session->sess_cert->peer_rsa_tmp;
1765 1766
			else
				{
1767
				pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
1768 1769 1770 1771
				if ((pkey == NULL) ||
					(pkey->type != EVP_PKEY_RSA) ||
					(pkey->pkey.rsa == NULL))
					{
B
Bodo Möller 已提交
1772
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1773 1774 1775
					goto err;
					}
				rsa=pkey->pkey.rsa;
B
Bodo Möller 已提交
1776
				EVP_PKEY_free(pkey);
1777 1778
				}
				
1779 1780
			tmp_buf[0]=s->client_version>>8;
			tmp_buf[1]=s->client_version&0xff;
1781
			if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
1782
					goto err;
1783

1784
			s->session->master_key_length=sizeof tmp_buf;
1785

1786 1787 1788 1789
			q=p;
			/* Fix buf for TLS and beyond */
			if (s->version > SSL3_VERSION)
				p+=2;
1790
			n=RSA_public_encrypt(sizeof tmp_buf,
1791
				tmp_buf,p,rsa,RSA_PKCS1_PADDING);
1792 1793 1794 1795
#ifdef PKCS1_CHECK
			if (s->options & SSL_OP_PKCS1_CHECK_1) p[1]++;
			if (s->options & SSL_OP_PKCS1_CHECK_2) tmp_buf[0]=0x70;
#endif
1796 1797 1798 1799 1800 1801
			if (n <= 0)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_ENCRYPT);
				goto err;
				}

1802 1803 1804 1805 1806 1807 1808
			/* Fix buf for TLS and beyond */
			if (s->version > SSL3_VERSION)
				{
				s2n(n,q);
				n+=2;
				}

1809
			s->session->master_key_length=
1810
				s->method->ssl3_enc->generate_master_secret(s,
1811
					s->session->master_key,
1812
					tmp_buf,sizeof tmp_buf);
1813
			OPENSSL_cleanse(tmp_buf,sizeof tmp_buf);
1814
			}
1815
#endif
1816
#ifndef OPENSSL_NO_KRB5
1817
		else if (l & SSL_kKRB5)
1818 1819 1820 1821 1822 1823
			{
			krb5_error_code	krb5rc;
			KSSL_CTX	*kssl_ctx = s->kssl_ctx;
			/*  krb5_data	krb5_ap_req;  */
			krb5_data	*enc_ticket;
			krb5_data	authenticator, *authp = NULL;
1824 1825 1826 1827 1828 1829 1830
			EVP_CIPHER_CTX	ciph_ctx;
			EVP_CIPHER	*enc = NULL;
			unsigned char	iv[EVP_MAX_IV_LENGTH];
			unsigned char	tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
			unsigned char	epms[SSL_MAX_MASTER_KEY_LENGTH 
						+ EVP_MAX_IV_LENGTH];
			int 		padl, outl = sizeof(epms);
1831

D
 
Dr. Stephen Henson 已提交
1832 1833
			EVP_CIPHER_CTX_init(&ciph_ctx);

1834
#ifdef KSSL_DEBUG
1835 1836
			printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
			        l, SSL_kKRB5);
1837 1838
#endif	/* KSSL_DEBUG */

1839 1840 1841 1842 1843
			authp = NULL;
#ifdef KRB5SENDAUTH
			if (KRB5SENDAUTH)  authp = &authenticator;
#endif	/* KRB5SENDAUTH */

1844
			krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
1845 1846
				&kssl_err);
			enc = kssl_map_enc(kssl_ctx->enctype);
1847 1848
			if (enc == NULL)
			    goto err;
1849
#ifdef KSSL_DEBUG
1850 1851 1852
			{
			printf("kssl_cget_tkt rtn %d\n", krb5rc);
			if (krb5rc && kssl_err.text)
1853
			  printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
1854
			}
1855 1856
#endif	/* KSSL_DEBUG */

1857 1858 1859
			if (krb5rc)
				{
				ssl3_send_alert(s,SSL3_AL_FATAL,
1860
						SSL_AD_HANDSHAKE_FAILURE);
1861
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
1862
						kssl_err.reason);
1863 1864
				goto err;
				}
1865

1866 1867 1868
			/*  20010406 VRS - Earlier versions used KRB5 AP_REQ
			**  in place of RFC 2712 KerberosWrapper, as in:
			**
1869 1870 1871 1872 1873 1874
			**  Send ticket (copy to *p, set n = length)
			**  n = krb5_ap_req.length;
			**  memcpy(p, krb5_ap_req.data, krb5_ap_req.length);
			**  if (krb5_ap_req.data)  
			**    kssl_krb5_free_data_contents(NULL,&krb5_ap_req);
			**
1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908
			**  Now using real RFC 2712 KerberosWrapper
			**  (Thanks to Simon Wilkinson <sxw@sxw.org.uk>)
			**  Note: 2712 "opaque" types are here replaced
			**  with a 2-byte length followed by the value.
			**  Example:
			**  KerberosWrapper= xx xx asn1ticket 0 0 xx xx encpms
			**  Where "xx xx" = length bytes.  Shown here with
			**  optional authenticator omitted.
			*/

			/*  KerberosWrapper.Ticket		*/
			s2n(enc_ticket->length,p);
			memcpy(p, enc_ticket->data, enc_ticket->length);
			p+= enc_ticket->length;
			n = enc_ticket->length + 2;

			/*  KerberosWrapper.Authenticator	*/
			if (authp  &&  authp->length)  
				{
				s2n(authp->length,p);
				memcpy(p, authp->data, authp->length);
				p+= authp->length;
				n+= authp->length + 2;
				
				free(authp->data);
				authp->data = NULL;
				authp->length = 0;
				}
			else
				{
				s2n(0,p);/*  null authenticator length	*/
				n+=2;
				}
 
1909
			if (RAND_bytes(tmp_buf,sizeof tmp_buf) <= 0)
1910 1911 1912
			    goto err;

			/*  20010420 VRS.  Tried it this way; failed.
1913
			**	EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,NULL);
1914 1915
			**	EVP_CIPHER_CTX_set_key_length(&ciph_ctx,
			**				kssl_ctx->length);
1916
			**	EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
1917 1918
			*/

1919
			memset(iv, 0, sizeof iv);  /* per RFC 1510 */
1920 1921
			EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,
				kssl_ctx->key,iv);
1922
			EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
1923
				sizeof tmp_buf);
1924
			EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
1925
			outl += padl;
B
Bodo Möller 已提交
1926 1927 1928 1929 1930
			if (outl > sizeof epms)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
				goto err;
				}
1931 1932 1933 1934 1935 1936 1937 1938
			EVP_CIPHER_CTX_cleanup(&ciph_ctx);

			/*  KerberosWrapper.EncryptedPreMasterSecret	*/
			s2n(outl,p);
			memcpy(p, epms, outl);
			p+=outl;
			n+=outl + 2;

1939 1940
			s->session->master_key_length=
			        s->method->ssl3_enc->generate_master_secret(s,
1941
					s->session->master_key,
1942
					tmp_buf, sizeof tmp_buf);
1943

1944 1945
			OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
			OPENSSL_cleanse(epms, outl);
1946
			}
1947
#endif
1948
#ifndef OPENSSL_NO_DH
1949
		else if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
1950 1951 1952
			{
			DH *dh_srvr,*dh_clnt;

1953 1954
			if (s->session->sess_cert->peer_dh_tmp != NULL)
				dh_srvr=s->session->sess_cert->peer_dh_tmp;
1955 1956 1957
			else
				{
				/* we get them from the cert */
1958
				ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_DH_PARAMETERS);
				goto err;
				}
			
			/* generate a new random key */
			if ((dh_clnt=DHparams_dup(dh_srvr)) == NULL)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
				goto err;
				}
			if (!DH_generate_key(dh_clnt))
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
				goto err;
				}

			/* use the 'p' output buffer for the DH key, but
			 * make sure to clear it out afterwards */
1977

1978
			n=DH_compute_key(p,dh_srvr->pub_key,dh_clnt);
1979

1980 1981 1982 1983 1984 1985 1986 1987
			if (n <= 0)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
				goto err;
				}

			/* generate master key from the result */
			s->session->master_key_length=
1988
				s->method->ssl3_enc->generate_master_secret(s,
1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003
					s->session->master_key,p,n);
			/* clean up */
			memset(p,0,n);

			/* send off the data */
			n=BN_num_bytes(dh_clnt->pub_key);
			s2n(n,p);
			BN_bn2bin(dh_clnt->pub_key,p);
			n+=2;

			DH_free(dh_clnt);

			/* perhaps clean things up a bit EAY EAY EAY EAY*/
			}
#endif
B
Bodo Möller 已提交
2004 2005

#ifndef OPENSSL_NO_ECDH 
2006
		else if ((l & SSL_kECDH) || (l & SSL_kEECDH))
B
Bodo Möller 已提交
2007
			{
N
Nils Larsch 已提交
2008 2009
			const EC_GROUP *srvr_group = NULL;
			EC_KEY *tkey;
B
Bodo Möller 已提交
2010
			int ecdh_clnt_cert = 0;
2011
			int field_size = 0;
B
Bodo Möller 已提交
2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035

			/* Did we send out the client's
			 * ECDH share for use in premaster
			 * computation as part of client certificate?
			 * If so, set ecdh_clnt_cert to 1.
			 */
			if ((l & SSL_kECDH) && (s->cert != NULL)) 
				{
				/* XXX: For now, we do not support client
				 * authentication using ECDH certificates.
				 * To add such support, one needs to add
				 * code that checks for appropriate 
				 * conditions and sets ecdh_clnt_cert to 1.
				 * For example, the cert have an ECC
				 * key on the same curve as the server's
				 * and the key should be authorized for
				 * key agreement.
				 *
				 * One also needs to add code in ssl3_connect
				 * to skip sending the certificate verify
				 * message.
				 *
				 * if ((s->cert->key->privatekey != NULL) &&
				 *     (s->cert->key->privatekey->type ==
B
Bodo Möller 已提交
2036
				 *      EVP_PKEY_EC) && ...)
B
Bodo Möller 已提交
2037 2038 2039 2040 2041 2042
				 * ecdh_clnt_cert = 1;
				 */
				}

			if (s->session->sess_cert->peer_ecdh_tmp != NULL)
				{
N
Nils Larsch 已提交
2043
				tkey = s->session->sess_cert->peer_ecdh_tmp;
B
Bodo Möller 已提交
2044 2045 2046 2047 2048 2049 2050
				}
			else
				{
				/* Get the Server Public Key from Cert */
				srvr_pub_pkey = X509_get_pubkey(s->session-> \
				    sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
				if ((srvr_pub_pkey == NULL) ||
2051
				    (srvr_pub_pkey->type != EVP_PKEY_EC) ||
N
Nils Larsch 已提交
2052
				    (srvr_pub_pkey->pkey.ec == NULL))
B
Bodo Möller 已提交
2053 2054 2055 2056 2057 2058
					{
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
					    ERR_R_INTERNAL_ERROR);
					goto err;
					}

N
Nils Larsch 已提交
2059
				tkey = srvr_pub_pkey->pkey.ec;
B
Bodo Möller 已提交
2060 2061
				}

N
Nils Larsch 已提交
2062 2063 2064
			srvr_group   = EC_KEY_get0_group(tkey);
			srvr_ecpoint = EC_KEY_get0_public_key(tkey);

B
Bodo Möller 已提交
2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077
			if ((srvr_group == NULL) || (srvr_ecpoint == NULL))
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
				    ERR_R_INTERNAL_ERROR);
				goto err;
				}

			if ((clnt_ecdh=EC_KEY_new()) == NULL) 
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
				goto err;
				}

N
Nils Larsch 已提交
2078 2079 2080 2081 2082
			if (!EC_KEY_set_group(clnt_ecdh, srvr_group))
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_EC_LIB);
				goto err;
				}
B
Bodo Möller 已提交
2083 2084
			if (ecdh_clnt_cert) 
				{ 
2085
				/* Reuse key info from our certificate
B
Bodo Möller 已提交
2086 2087 2088
				 * We only need our private key to perform
				 * the ECDH computation.
				 */
N
Nils Larsch 已提交
2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101
				const BIGNUM *priv_key;
				tkey = s->cert->key->privatekey->pkey.ec;
				priv_key = EC_KEY_get0_private_key(tkey);
				if (priv_key == NULL)
					{
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
					goto err;
					}
				if (!EC_KEY_set_private_key(clnt_ecdh, priv_key))
					{
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_EC_LIB);
					goto err;
					}
B
Bodo Möller 已提交
2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112
				}
			else 
				{
				/* Generate a new ECDH key pair */
				if (!(EC_KEY_generate_key(clnt_ecdh)))
					{
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_ECDH_LIB);
					goto err;
					}
				}

2113 2114
			/* use the 'p' output buffer for the ECDH key, but
			 * make sure to clear it out afterwards
B
Bodo Möller 已提交
2115 2116
			 */

N
Nils Larsch 已提交
2117
			field_size = EC_GROUP_get_degree(srvr_group);
2118 2119 2120 2121 2122 2123
			if (field_size <= 0)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
				       ERR_R_ECDH_LIB);
				goto err;
				}
B
Bodo Möller 已提交
2124
			n=ECDH_compute_key(p, (field_size+7)/8, srvr_ecpoint, clnt_ecdh, NULL);
B
Bodo Möller 已提交
2125
			if (n <= 0)
2126 2127
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
B
Bodo Möller 已提交
2128
				       ERR_R_ECDH_LIB);
2129
				goto err;
B
Bodo Möller 已提交
2130 2131
				}

2132 2133
			/* generate master key from the result */
			s->session->master_key_length = s->method->ssl3_enc \
B
Bodo Möller 已提交
2134 2135 2136 2137
			    -> generate_master_secret(s, 
				s->session->master_key,
				p, n);

2138
			memset(p, 0, n); /* clean up */
B
Bodo Möller 已提交
2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150

			if (ecdh_clnt_cert) 
				{
				/* Send empty client key exch message */
				n = 0;
				}
			else 
				{
				/* First check the size of encoding and
				 * allocate memory accordingly.
				 */
				encoded_pt_len = 
N
Nils Larsch 已提交
2151 2152
				    EC_POINT_point2oct(srvr_group, 
					EC_KEY_get0_public_key(clnt_ecdh), 
B
Bodo Möller 已提交
2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167
					POINT_CONVERSION_UNCOMPRESSED, 
					NULL, 0, NULL);

				encodedPoint = (unsigned char *) 
				    OPENSSL_malloc(encoded_pt_len * 
					sizeof(unsigned char)); 
				bn_ctx = BN_CTX_new();
				if ((encodedPoint == NULL) || 
				    (bn_ctx == NULL)) 
					{
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
					goto err;
					}

				/* Encode the public key */
N
Nils Larsch 已提交
2168 2169
				n = EC_POINT_point2oct(srvr_group, 
				    EC_KEY_get0_public_key(clnt_ecdh), 
B
Bodo Möller 已提交
2170 2171 2172 2173
				    POINT_CONVERSION_UNCOMPRESSED, 
				    encodedPoint, encoded_pt_len, bn_ctx);

				*p = n; /* length of encoded point */
2174
				/* Encoded point will be copied here */
B
Bodo Möller 已提交
2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189
				p += 1; 
				/* copy the point */
				memcpy((unsigned char *)p, encodedPoint, n);
				/* increment n to account for length field */
				n += 1; 
				}

			/* Free allocated memory */
			BN_CTX_free(bn_ctx);
			if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
			if (clnt_ecdh != NULL) 
				 EC_KEY_free(clnt_ecdh);
			EVP_PKEY_free(srvr_pub_pkey);
			}
#endif /* !OPENSSL_NO_ECDH */
2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271
#ifndef OPENSSL_NO_PSK
		else if (l & SSL_kPSK)
			{
			char identity[PSK_MAX_IDENTITY_LEN];
			unsigned char *t = NULL;
			unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4];
			unsigned int pre_ms_len = 0, psk_len = 0;
			int psk_err = 1;

			n = 0;
			if (s->psk_client_callback == NULL)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
					SSL_R_PSK_NO_CLIENT_CB);
				goto err;
				}

			psk_len = s->psk_client_callback(s, s->ctx->psk_identity_hint,
				identity, PSK_MAX_IDENTITY_LEN,
				psk_or_pre_ms, sizeof(psk_or_pre_ms));
			if (psk_len > PSK_MAX_PSK_LEN)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
					ERR_R_INTERNAL_ERROR);
				goto psk_err;
				}
			else if (psk_len == 0)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
					SSL_R_PSK_IDENTITY_NOT_FOUND);
				goto psk_err;
				}

			/* create PSK pre_master_secret */
			pre_ms_len = 2+psk_len+2+psk_len;
			t = psk_or_pre_ms;
			memmove(psk_or_pre_ms+psk_len+4, psk_or_pre_ms, psk_len);
			s2n(psk_len, t);
			memset(t, 0, psk_len);
			t+=psk_len;
			s2n(psk_len, t);

			if (s->session->psk_identity_hint != NULL)
				OPENSSL_free(s->session->psk_identity_hint);
			s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
			if (s->ctx->psk_identity_hint != NULL &&
				s->session->psk_identity_hint == NULL)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
					ERR_R_MALLOC_FAILURE);
				goto psk_err;
				}

			if (s->session->psk_identity != NULL)
				OPENSSL_free(s->session->psk_identity);
			s->session->psk_identity = BUF_strdup(identity);
			if (s->session->psk_identity == NULL)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
					ERR_R_MALLOC_FAILURE);
				goto psk_err;
				}

			s->session->master_key_length =
				s->method->ssl3_enc->generate_master_secret(s,
					s->session->master_key,
					psk_or_pre_ms, pre_ms_len); 
			n = strlen(identity);
			s2n(n, p);
			memcpy(p, identity, n);
			n+=2;
			psk_err = 0;
		psk_err:
			OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN);
			OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));	
			if (psk_err != 0)
				{
				ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
				goto err;
				}
			}
#endif
2272
		else
2273
			{
B
Bodo Möller 已提交
2274 2275 2276 2277
			ssl3_send_alert(s, SSL3_AL_FATAL,
			    SSL_AD_HANDSHAKE_FAILURE);
			SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
			    ERR_R_INTERNAL_ERROR);
2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292
			goto err;
			}
		
		*(d++)=SSL3_MT_CLIENT_KEY_EXCHANGE;
		l2n3(n,d);

		s->state=SSL3_ST_CW_KEY_EXCH_B;
		/* number of bytes to write */
		s->init_num=n+4;
		s->init_off=0;
		}

	/* SSL3_ST_CW_KEY_EXCH_B */
	return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
err:
B
Bodo Möller 已提交
2293 2294 2295 2296 2297
#ifndef OPENSSL_NO_ECDH
	BN_CTX_free(bn_ctx);
	if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
	if (clnt_ecdh != NULL) 
		EC_KEY_free(clnt_ecdh);
2298
	EVP_PKEY_free(srvr_pub_pkey);
B
Bodo Möller 已提交
2299
#endif
2300 2301 2302
	return(-1);
	}

B
Ben Laurie 已提交
2303
int ssl3_send_client_verify(SSL *s)
2304 2305 2306 2307
	{
	unsigned char *p,*d;
	unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
	EVP_PKEY *pkey;
2308
#ifndef OPENSSL_NO_RSA
B
Ben Laurie 已提交
2309
	unsigned u=0;
2310
#endif
2311
	unsigned long n;
N
make  
Nils Larsch 已提交
2312
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
2313 2314
	int j;
#endif
2315 2316 2317 2318 2319 2320 2321

	if (s->state == SSL3_ST_CW_CERT_VRFY_A)
		{
		d=(unsigned char *)s->init_buf->data;
		p= &(d[4]);
		pkey=s->cert->key->privatekey;

2322 2323
		s->method->ssl3_enc->cert_verify_mac(s,&(s->s3->finish_dgst2),
			&(data[MD5_DIGEST_LENGTH]));
2324

2325
#ifndef OPENSSL_NO_RSA
2326 2327
		if (pkey->type == EVP_PKEY_RSA)
			{
2328 2329
			s->method->ssl3_enc->cert_verify_mac(s,
				&(s->s3->finish_dgst1),&(data[0]));
2330 2331
			if (RSA_sign(NID_md5_sha1, data,
					 MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
B
Ben Laurie 已提交
2332
					&(p[2]), &u, pkey->pkey.rsa) <= 0 )
2333 2334 2335 2336
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB);
				goto err;
				}
B
Ben Laurie 已提交
2337 2338
			s2n(u,p);
			n=u+2;
2339 2340 2341
			}
		else
#endif
2342
#ifndef OPENSSL_NO_DSA
2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356
			if (pkey->type == EVP_PKEY_DSA)
			{
			if (!DSA_sign(pkey->save_type,
				&(data[MD5_DIGEST_LENGTH]),
				SHA_DIGEST_LENGTH,&(p[2]),
				(unsigned int *)&j,pkey->pkey.dsa))
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_DSA_LIB);
				goto err;
				}
			s2n(j,p);
			n=j+2;
			}
		else
B
Bodo Möller 已提交
2357 2358
#endif
#ifndef OPENSSL_NO_ECDSA
2359
			if (pkey->type == EVP_PKEY_EC)
B
Bodo Möller 已提交
2360 2361 2362 2363
			{
			if (!ECDSA_sign(pkey->save_type,
				&(data[MD5_DIGEST_LENGTH]),
				SHA_DIGEST_LENGTH,&(p[2]),
N
Nils Larsch 已提交
2364
				(unsigned int *)&j,pkey->pkey.ec))
B
Bodo Möller 已提交
2365 2366 2367 2368 2369 2370 2371 2372 2373
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
				    ERR_R_ECDSA_LIB);
				goto err;
				}
			s2n(j,p);
			n=j+2;
			}
		else
2374 2375
#endif
			{
B
Bodo Möller 已提交
2376
			SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_INTERNAL_ERROR);
2377 2378 2379 2380 2381
			goto err;
			}
		*(d++)=SSL3_MT_CERTIFICATE_VERIFY;
		l2n3(n,d);

2382
		s->state=SSL3_ST_CW_CERT_VRFY_B;
2383 2384 2385 2386 2387 2388 2389 2390
		s->init_num=(int)n+4;
		s->init_off=0;
		}
	return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
err:
	return(-1);
	}

B
Ben Laurie 已提交
2391
int ssl3_send_client_certificate(SSL *s)
2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439
	{
	X509 *x509=NULL;
	EVP_PKEY *pkey=NULL;
	int i;
	unsigned long l;

	if (s->state ==	SSL3_ST_CW_CERT_A)
		{
		if ((s->cert == NULL) ||
			(s->cert->key->x509 == NULL) ||
			(s->cert->key->privatekey == NULL))
			s->state=SSL3_ST_CW_CERT_B;
		else
			s->state=SSL3_ST_CW_CERT_C;
		}

	/* We need to get a client cert */
	if (s->state == SSL3_ST_CW_CERT_B)
		{
		/* If we get an error, we need to
		 * ssl->rwstate=SSL_X509_LOOKUP; return(-1);
		 * We then get retied later */
		i=0;
		if (s->ctx->client_cert_cb != NULL)
			i=s->ctx->client_cert_cb(s,&(x509),&(pkey));
		if (i < 0)
			{
			s->rwstate=SSL_X509_LOOKUP;
			return(-1);
			}
		s->rwstate=SSL_NOTHING;
		if ((i == 1) && (pkey != NULL) && (x509 != NULL))
			{
			s->state=SSL3_ST_CW_CERT_B;
			if (	!SSL_use_certificate(s,x509) ||
				!SSL_use_PrivateKey(s,pkey))
				i=0;
			}
		else if (i == 1)
			{
			i=0;
			SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE,SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
			}

		if (x509 != NULL) X509_free(x509);
		if (pkey != NULL) EVP_PKEY_free(pkey);
		if (i == 0)
			{
2440 2441 2442 2443 2444 2445 2446 2447 2448 2449
			if (s->version == SSL3_VERSION)
				{
				s->s3->tmp.cert_req=0;
				ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_NO_CERTIFICATE);
				return(1);
				}
			else
				{
				s->s3->tmp.cert_req=2;
				}
2450 2451 2452 2453 2454 2455 2456 2457 2458
			}

		/* Ok, we have a cert */
		s->state=SSL3_ST_CW_CERT_C;
		}

	if (s->state == SSL3_ST_CW_CERT_C)
		{
		s->state=SSL3_ST_CW_CERT_D;
2459 2460
		l=ssl3_output_cert_chain(s,
			(s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
2461 2462 2463 2464 2465 2466 2467 2468 2469
		s->init_num=(int)l;
		s->init_off=0;
		}
	/* SSL3_ST_CW_CERT_D */
	return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
	}

#define has_bits(i,m)	(((i)&(m)) == (m))

B
Ben Laurie 已提交
2470
int ssl3_check_cert_and_algorithm(SSL *s)
2471 2472 2473 2474
	{
	int i,idx;
	long algs;
	EVP_PKEY *pkey=NULL;
2475
	SESS_CERT *sc;
2476
#ifndef OPENSSL_NO_RSA
2477
	RSA *rsa;
2478
#endif
2479
#ifndef OPENSSL_NO_DH
2480
	DH *dh;
2481
#endif
2482

2483 2484
	sc=s->session->sess_cert;
	if (sc == NULL)
2485
		{
B
Bodo Möller 已提交
2486
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
2487 2488 2489 2490 2491 2492
		goto err;
		}

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

	/* we don't have a certificate */
2493
	if (algs & (SSL_aDH|SSL_aNULL|SSL_aKRB5|SSL_kPSK))
2494 2495
		return(1);

2496
#ifndef OPENSSL_NO_RSA
2497
	rsa=s->session->sess_cert->peer_rsa_tmp;
2498
#endif
2499
#ifndef OPENSSL_NO_DH
2500
	dh=s->session->sess_cert->peer_dh_tmp;
2501
#endif
2502 2503 2504

	/* This is the passed certificate */

2505
	idx=sc->peer_cert_type;
B
Bodo Möller 已提交
2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520
#ifndef OPENSSL_NO_ECDH
	if (idx == SSL_PKEY_ECC)
		{
		if (check_srvr_ecc_cert_and_alg(sc->peer_pkeys[idx].x509,
		    s->s3->tmp.new_cipher) == 0) 
			{ /* check failed */
			SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_BAD_ECC_CERT);
			goto f_err;			
			}
		else 
			{
			return 1;
			}
		}
#endif
2521 2522
	pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509);
	i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey);
2523
	EVP_PKEY_free(pkey);
2524 2525 2526 2527 2528 2529 2530 2531

	
	/* Check that we have a certificate if we require one */
	if ((algs & SSL_aRSA) && !has_bits(i,EVP_PK_RSA|EVP_PKT_SIGN))
		{
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_SIGNING_CERT);
		goto f_err;
		}
2532
#ifndef OPENSSL_NO_DSA
2533 2534 2535 2536 2537 2538
	else if ((algs & SSL_aDSS) && !has_bits(i,EVP_PK_DSA|EVP_PKT_SIGN))
		{
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DSA_SIGNING_CERT);
		goto f_err;
		}
#endif
2539
#ifndef OPENSSL_NO_RSA
2540 2541 2542 2543 2544 2545
	if ((algs & SSL_kRSA) &&
		!(has_bits(i,EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL)))
		{
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_ENCRYPTING_CERT);
		goto f_err;
		}
2546
#endif
2547
#ifndef OPENSSL_NO_DH
2548
	if ((algs & SSL_kEDH) &&
2549 2550 2551 2552 2553 2554 2555 2556 2557 2558
		!(has_bits(i,EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL)))
		{
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_KEY);
		goto f_err;
		}
	else if ((algs & SSL_kDHr) && !has_bits(i,EVP_PK_DH|EVP_PKS_RSA))
		{
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_RSA_CERT);
		goto f_err;
		}
2559
#ifndef OPENSSL_NO_DSA
2560 2561 2562 2563 2564 2565 2566 2567
	else if ((algs & SSL_kDHd) && !has_bits(i,EVP_PK_DH|EVP_PKS_DSA))
		{
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_DSA_CERT);
		goto f_err;
		}
#endif
#endif

2568
	if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i,EVP_PKT_EXP))
2569
		{
2570
#ifndef OPENSSL_NO_RSA
2571 2572
		if (algs & SSL_kRSA)
			{
2573
			if (rsa == NULL
2574
			    || RSA_size(rsa)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
2575 2576 2577 2578 2579 2580 2581
				{
				SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
				goto f_err;
				}
			}
		else
#endif
2582
#ifndef OPENSSL_NO_DH
2583
			if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
2584 2585
			    {
			    if (dh == NULL
2586
				|| DH_size(dh)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600
				{
				SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_DH_KEY);
				goto f_err;
				}
			}
		else
#endif
			{
			SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
			goto f_err;
			}
		}
	return(1);
f_err:
2601
	ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
2602 2603 2604
err:
	return(0);
	}