s3_clnt.c 58.9 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-2003 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

#include <stdio.h>
126 127
#include "ssl_locl.h"
#include "kssl_lcl.h"
128 129 130 131
#include <openssl/buffer.h>
#include <openssl/rand.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
132
#include <openssl/md5.h>
N
make  
Nils Larsch 已提交
133
#ifndef OPENSSL_NO_DH
134
#include <openssl/dh.h>
N
make  
Nils Larsch 已提交
135
#endif
136
#include <openssl/bn.h>
137

138
static const SSL_METHOD *ssl3_get_client_method(int ver);
139
static int ca_dn_cmp(const X509_NAME * const *a,const X509_NAME * const *b);
B
Bodo Möller 已提交
140 141 142 143 144 145

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

146
static const SSL_METHOD *ssl3_get_client_method(int ver)
147
	{
148
	if (ver == SSL3_VERSION)
149 150 151 152 153
		return(SSLv3_client_method());
	else
		return(NULL);
	}

154 155 156 157
IMPLEMENT_ssl3_meth_func(SSLv3_client_method,
			ssl_undefined_function,
			ssl3_connect,
			ssl3_get_client_method)
158

U
Ulf Möller 已提交
159
int ssl3_connect(SSL *s)
160
	{
R
Richard Levitte 已提交
161
	BUF_MEM *buf=NULL;
D
Dr. Stephen Henson 已提交
162
	unsigned long Time=(unsigned long)time(NULL),l;
163
	long num1;
B
Ben Laurie 已提交
164
	void (*cb)(const SSL *ssl,int type,int val)=NULL;
165 166 167
	int ret= -1;
	int new_state,state,skip=0;;

168
	RAND_add(&Time,sizeof(Time),0);
169
	ERR_clear_error();
170
	clear_sys_error();
171 172 173 174 175 176 177

	if (s->info_callback != NULL)
		cb=s->info_callback;
	else if (s->ctx->info_callback != NULL)
		cb=s->ctx->info_callback;
	
	s->in_handshake++;
178
	if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
179 180 181 182 183 184 185 186 187 188

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

		switch(s->state)
			{
		case SSL_ST_RENEGOTIATE:
			s->new_session=1;
			s->state=SSL_ST_CONNECT;
189
			s->ctx->stats.sess_connect_renegotiate++;
190 191 192 193 194 195
			/* break */
		case SSL_ST_BEFORE:
		case SSL_ST_CONNECT:
		case SSL_ST_BEFORE|SSL_ST_CONNECT:
		case SSL_ST_OK|SSL_ST_CONNECT:

196
			s->server=0;
197 198
			if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);

199
			if ((s->version & 0xff00 ) != 0x0300)
200
				{
B
Bodo Möller 已提交
201
				SSLerr(SSL_F_SSL3_CONNECT, ERR_R_INTERNAL_ERROR);
202 203 204 205
				ret = -1;
				goto end;
				}
				
206
			/* s->version=SSL3_VERSION; */
207 208 209 210 211 212 213 214 215 216 217 218 219 220 221
			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 已提交
222
				buf=NULL;
223 224 225 226 227
				}

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

			/* setup buffing BIO */
228
			if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
229 230 231 232 233 234

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

			ssl3_init_finished_mac(s);

			s->state=SSL3_ST_CW_CLNT_HELLO_A;
235
			s->ctx->stats.sess_connect++;
236 237 238 239 240 241 242 243 244 245 246 247 248
			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 */
249 250
			if (s->bbio != s->wbio)
				s->wbio=BIO_push(s->bbio,s->wbio);
251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266

			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;
			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 已提交
267
			/* Check if it is anon DH/ECDH */
268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
			if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
				{
				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 已提交
318
		case SSL3_ST_CW_CERT_D:
319 320 321 322 323 324 325 326 327 328 329 330 331
			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 */
332 333
			/* 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 已提交
334 335 336 337 338 339 340
			/* 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.
			 */
341
			if (s->s3->tmp.cert_req == 1)
342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371
				{
				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;
372 373 374
#ifdef OPENSSL_NO_COMP
			s->session->compress_meth=0;
#else
375 376 377 378 379
			if (s->s3->tmp.new_compression == NULL)
				s->session->compress_meth=0;
			else
				s->session->compress_meth=
					s->s3->tmp.new_compression->id;
380
#endif
381
			if (!s->method->ssl3_enc->setup_key_block(s))
382 383 384 385 386
				{
				ret= -1;
				goto end;
				}

387
			if (!s->method->ssl3_enc->change_cipher_state(s,
388 389 390 391 392 393 394 395 396 397 398 399
				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,
400 401
				s->method->ssl3_enc->client_finished_label,
				s->method->ssl3_enc->client_finished_label_len);
402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427
			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,
428
				SSL3_ST_CR_FINISHED_B);
429 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;

			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);

456
			if (s->init_buf != NULL)
457
				{
458 459
				BUF_MEM_free(s->init_buf);
				s->init_buf=NULL;
460
				}
461 462 463 464 465 466

			/* 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 */
467 468 469 470 471

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

			ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
472
			if (s->hit) s->ctx->stats.sess_hit++;
473 474 475 476

			ret=1;
			/* s->server=0; */
			s->handshake_func=ssl3_connect;
477
			s->ctx->stats.sess_connect_good++;
478 479 480 481

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

			goto end;
482
			/* break; */
483 484 485 486 487 488 489 490 491 492 493
			
		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)
			{
494 495 496 497 498
			if (s->debug)
				{
				if ((ret=BIO_flush(s->wbio)) <= 0)
					goto end;
				}
499 500 501 502 503 504 505 506 507 508 509 510

			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:
511
	s->in_handshake--;
R
Richard Levitte 已提交
512 513
	if (buf != NULL)
		BUF_MEM_free(buf);
514 515 516 517 518 519
	if (cb != NULL)
		cb(s,SSL_CB_CONNECT_EXIT,ret);
	return(ret);
	}


B
Ben Laurie 已提交
520
int ssl3_client_hello(SSL *s)
521 522 523
	{
	unsigned char *buf;
	unsigned char *p,*d;
524
	int i;
525
	unsigned long Time,l;
526 527
#ifndef OPENSSL_NO_COMP
	int j;
528
	SSL_COMP *comp;
529
#endif
530 531 532 533 534

	buf=(unsigned char *)s->init_buf->data;
	if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
		{
		if ((s->session == NULL) ||
535 536
			(s->session->ssl_version != s->version) ||
			(s->session->not_resumable))
537 538 539 540 541 542 543
			{
			if (!ssl_get_new_session(s,0))
				goto err;
			}
		/* else use the pre-loaded session */

		p=s->s3->client_random;
D
Dr. Stephen Henson 已提交
544
		Time=(unsigned long)time(NULL);			/* Time */
545
		l2n(Time,p);
546 547
		if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
			goto err;
548 549 550 551

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

552 553
		*(p++)=s->version>>8;
		*(p++)=s->version&0xff;
554
		s->client_version=s->version;
555 556 557 558 559 560 561 562 563 564 565 566 567

		/* 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)
			{
568
			if (i > (int)sizeof(s->session->session_id))
B
Bodo Möller 已提交
569 570 571 572
				{
				SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
				goto err;
				}
573 574 575 576 577
			memcpy(p,s->session->session_id,i);
			p+=i;
			}
		
		/* Ciphers supported */
578
		i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),0);
579 580 581 582 583 584 585 586
		if (i == 0)
			{
			SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
			goto err;
			}
		s2n(i,p);
		p+=i;

587
		/* COMPRESSION */
588 589 590
#ifdef OPENSSL_NO_COMP
		*(p++)=1;
#else
591 592 593

		if ((s->options & SSL_OP_NO_COMPRESSION)
					|| !s->ctx->comp_methods)
594 595
			j=0;
		else
B
Ben Laurie 已提交
596
			j=sk_SSL_COMP_num(s->ctx->comp_methods);
597 598 599
		*(p++)=1+j;
		for (i=0; i<j; i++)
			{
B
Ben Laurie 已提交
600
			comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
601 602
			*(p++)=comp->id;
			}
603
#endif
604
		*(p++)=0; /* Add the NULL method */
605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622
		
		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 已提交
623
int ssl3_get_server_hello(SSL *s)
624
	{
B
Ben Laurie 已提交
625
	STACK_OF(SSL_CIPHER) *sk;
626 627 628 629 630
	SSL_CIPHER *c;
	unsigned char *p,*d;
	int i,al,ok;
	unsigned int j;
	long n;
631
#ifndef OPENSSL_NO_COMP
632
	SSL_COMP *comp;
633
#endif
634

B
Ben Laurie 已提交
635
	n=s->method->ssl_get_message(s,
636 637
		SSL3_ST_CR_SRVR_HELLO_A,
		SSL3_ST_CR_SRVR_HELLO_B,
B
Ben Laurie 已提交
638
		-1,
639 640 641 642
		300, /* ?? */
		&ok);

	if (!ok) return((int)n);
B
Ben Laurie 已提交
643 644 645 646 647 648 649 650 651 652 653 654 655

	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;
656
				SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
B
Ben Laurie 已提交
657 658 659 660 661 662 663 664
				goto f_err;
				}
			}
		}
	
	if ( s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO)
		{
		al=SSL_AD_UNEXPECTED_MESSAGE;
665
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
B
Ben Laurie 已提交
666 667 668
		goto f_err;
		}

669
	d=p=(unsigned char *)s->init_msg;
670

671
	if ((p[0] != (s->version>>8)) || (p[1] != (s->version&0xff)))
672 673
		{
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_SSL_VERSION);
674 675 676
		s->version=(s->version&0xff00)|p[1];
		al=SSL_AD_PROTOCOL_VERSION;
		goto f_err;
677 678 679 680 681 682 683 684 685 686 687
		}
	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++);

688
	if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE))
689
		{
690 691 692
		al=SSL_AD_ILLEGAL_PARAMETER;
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SSL3_SESSION_ID_TOO_LONG);
		goto f_err;
693
		}
694

B
Ben Laurie 已提交
695 696 697 698 699 700
	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))
		{
701
		/* actually a client application bug */
B
Ben Laurie 已提交
702 703 704 705 706 707
		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;
	    }
708
	else	/* a miss or crap from the other end */
709
		{
710 711
		/* If we were trying for session-id reuse, make a new
		 * SSL_SESSION so we don't stuff up other people */
712
		s->hit=0;
713 714 715 716 717 718 719 720 721 722
		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 */
723 724 725 726 727 728
		}
	p+=j;
	c=ssl_get_cipher_by_char(s,p);
	if (c == NULL)
		{
		/* unknown cipher */
729
		al=SSL_AD_ILLEGAL_PARAMETER;
730 731 732 733 734 735
		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 已提交
736
	i=sk_SSL_CIPHER_find(sk,c);
737 738 739
	if (i < 0)
		{
		/* we did not say we would use this cipher */
740
		al=SSL_AD_ILLEGAL_PARAMETER;
741 742 743 744
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
		goto f_err;
		}

745 746 747 748 749
	/* 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;
750
	if (s->hit && (s->session->cipher_id != c->id))
751
		{
752
		if (!(s->options &
753 754
			SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
			{
755
			al=SSL_AD_ILLEGAL_PARAMETER;
756 757 758 759 760 761 762
			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 */
763
	/* COMPRESSION */
764 765 766 767 768 769 770 771
#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
772
	j= *(p++);
773
	if ((j == 0) || (s->options & SSL_OP_NO_COMPRESSION))
774 775 776 777 778
		comp=NULL;
	else
		comp=ssl3_comp_find(s->ctx->comp_methods,j);
	
	if ((j != 0) && (comp == NULL))
779
		{
780
		al=SSL_AD_ILLEGAL_PARAMETER;
781 782 783
		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
		goto f_err;
		}
784 785 786 787
	else
		{
		s->s3->tmp.new_compression=comp;
		}
788
#endif
789 790 791 792

	if (p != (d+n))
		{
		/* wrong packet length */
793
		al=SSL_AD_DECODE_ERROR;
794 795 796 797 798 799 800 801 802 803 804
		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 已提交
805
int ssl3_get_server_certificate(SSL *s)
806 807 808 809
	{
	int al,i,ok,ret= -1;
	unsigned long n,nc,llen,l;
	X509 *x=NULL;
810 811
	const unsigned char *q,*p;
	unsigned char *d;
B
Ben Laurie 已提交
812
	STACK_OF(X509) *sk=NULL;
813
	SESS_CERT *sc;
814
	EVP_PKEY *pkey=NULL;
815
	int need_cert = 1; /* VRS: 0=> will allow null cert if auth == KRB5 */
816

B
Ben Laurie 已提交
817
	n=s->method->ssl_get_message(s,
818 819 820
		SSL3_ST_CR_CERT_A,
		SSL3_ST_CR_CERT_B,
		-1,
821
		s->max_cert_list,
822 823 824 825 826 827 828 829 830 831 832 833
		&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)
		{
834
		al=SSL_AD_UNEXPECTED_MESSAGE;
835 836 837
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_BAD_MESSAGE_TYPE);
		goto f_err;
		}
838
	p=d=(unsigned char *)s->init_msg;
839

B
Ben Laurie 已提交
840
	if ((sk=sk_X509_new_null()) == NULL)
841 842 843 844 845 846 847 848
		{
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
		goto err;
		}

	n2l3(p,llen);
	if (llen+3 != n)
		{
849
		al=SSL_AD_DECODE_ERROR;
850 851 852 853 854 855 856 857
		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)
			{
858
			al=SSL_AD_DECODE_ERROR;
859 860 861 862 863 864 865 866
			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)
			{
867
			al=SSL_AD_BAD_CERTIFICATE;
868 869 870 871 872
			SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_ASN1_LIB);
			goto f_err;
			}
		if (q != (p+l))
			{
873
			al=SSL_AD_DECODE_ERROR;
874 875 876
			SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
			goto f_err;
			}
B
Ben Laurie 已提交
877
		if (!sk_X509_push(sk,x))
878 879 880 881 882 883 884 885 886 887
			{
			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);
888 889
	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
#ifndef OPENSSL_NO_KRB5
890 891
	        && (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
	        != (SSL_aKRB5|SSL_kKRB5)
892
#endif /* OPENSSL_NO_KRB5 */
893
	        )
894 895 896 897 898
		{
		al=ssl_verify_alarm_type(s->verify_result);
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
		goto f_err; 
		}
899
	ERR_clear_error(); /* but we keep s->verify_result */
900

901 902
	sc=ssl_sess_cert_new();
	if (sc == NULL) goto err;
903

904 905
	if (s->session->sess_cert) ssl_sess_cert_free(s->session->sess_cert);
	s->session->sess_cert=sc;
906

907
	sc->cert_chain=sk;
908 909
	/* Inconsistency alert: cert_chain does include the peer's
	 * certificate, which we don't include in s3_srvr.c */
B
Ben Laurie 已提交
910
	x=sk_X509_value(sk,0);
911
	sk=NULL;
912
 	/* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
913 914 915

	pkey=X509_get_pubkey(x);

916 917 918 919
	/* 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;
920 921 922 923 924

#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,
925
	        s->s3->tmp.new_cipher->algorithms, need_cert);
926 927
#endif    /* KSSL_DEBUG */

928
	if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey)))
929 930 931
		{
		x=NULL;
		al=SSL3_AL_FATAL;
932 933
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
			SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
934 935 936 937
		goto f_err;
		}

	i=ssl_cert_type(x,pkey);
938
	if (need_cert && i < 0)
939 940 941
		{
		x=NULL;
		al=SSL3_AL_FATAL;
942 943
		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
			SSL_R_UNKNOWN_CERTIFICATE_TYPE);
944 945 946
		goto f_err;
		}

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
	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;
		}
972
	s->session->verify_result = s->verify_result;
973 974 975 976 977 978 979 980 981 982

	x=NULL;
	ret=1;

	if (0)
		{
f_err:
		ssl3_send_alert(s,SSL3_AL_FATAL,al);
		}
err:
983 984
	EVP_PKEY_free(pkey);
	X509_free(x);
B
Ben Laurie 已提交
985
	sk_X509_pop_free(sk,X509_free);
986 987 988
	return(ret);
	}

B
Ben Laurie 已提交
989
int ssl3_get_key_exchange(SSL *s)
990
	{
991
#ifndef OPENSSL_NO_RSA
992 993 994 995 996 997 998
	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;
999
#ifndef OPENSSL_NO_RSA
1000
	RSA *rsa=NULL;
1001
#endif
1002
#ifndef OPENSSL_NO_DH
1003
	DH *dh=NULL;
1004
#endif
B
Bodo Möller 已提交
1005 1006 1007 1008 1009 1010 1011
#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
1012

1013 1014
	/* use same message size as in ssl3_get_certificate_request()
	 * as ServerKeyExchange message may be skipped */
B
Ben Laurie 已提交
1015
	n=s->method->ssl_get_message(s,
1016 1017 1018
		SSL3_ST_CR_KEY_EXCH_A,
		SSL3_ST_CR_KEY_EXCH_B,
		-1,
1019
		s->max_cert_list,
1020 1021 1022 1023 1024 1025 1026 1027 1028 1029
		&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);
		}

1030
	param=p=(unsigned char *)s->init_msg;
1031

1032
	if (s->session->sess_cert != NULL)
1033
		{
1034
#ifndef OPENSSL_NO_RSA
1035
		if (s->session->sess_cert->peer_rsa_tmp != NULL)
1036
			{
1037 1038
			RSA_free(s->session->sess_cert->peer_rsa_tmp);
			s->session->sess_cert->peer_rsa_tmp=NULL;
1039 1040
			}
#endif
1041
#ifndef OPENSSL_NO_DH
1042
		if (s->session->sess_cert->peer_dh_tmp)
1043
			{
1044 1045
			DH_free(s->session->sess_cert->peer_dh_tmp);
			s->session->sess_cert->peer_dh_tmp=NULL;
1046
			}
B
Bodo Möller 已提交
1047 1048 1049 1050 1051 1052 1053
#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;
			}
1054 1055 1056 1057
#endif
		}
	else
		{
1058
		s->session->sess_cert=ssl_sess_cert_new();
1059 1060 1061 1062
		}

	param_len=0;
	alg=s->s3->tmp.new_cipher->algorithms;
1063
	EVP_MD_CTX_init(&md_ctx);
1064

1065
#ifndef OPENSSL_NO_RSA
1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076
	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)
			{
1077
			al=SSL_AD_DECODE_ERROR;
1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091
			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)
			{
1092
			al=SSL_AD_DECODE_ERROR;
1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105
			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)
1106
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
1107 1108
		else
			{
B
Bodo Möller 已提交
1109
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1110 1111
			goto err;
			}
1112
		s->session->sess_cert->peer_rsa_tmp=rsa;
1113
		rsa=NULL;
1114
		}
1115
#else /* OPENSSL_NO_RSA */
1116 1117
	if (0)
		;
1118
#endif
1119
#ifndef OPENSSL_NO_DH
1120
	else if (alg & SSL_kEDH)
1121 1122 1123 1124 1125 1126 1127 1128 1129 1130
		{
		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)
			{
1131
			al=SSL_AD_DECODE_ERROR;
1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145
			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)
			{
1146
			al=SSL_AD_DECODE_ERROR;
1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160
			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)
			{
1161
			al=SSL_AD_DECODE_ERROR;
1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172
			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;

1173
#ifndef OPENSSL_NO_RSA
1174
		if (alg & SSL_aRSA)
1175
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
1176 1177 1178
#else
		if (0)
			;
1179
#endif
1180
#ifndef OPENSSL_NO_DSA
1181
		else if (alg & SSL_aDSS)
1182
			pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
1183 1184 1185
#endif
		/* else anonymous DH, so no certificate or pkey. */

1186
		s->session->sess_cert->peer_dh_tmp=dh;
1187
		dh=NULL;
1188 1189 1190
		}
	else if ((alg & SSL_kDHr) || (alg & SSL_kDHd))
		{
1191
		al=SSL_AD_ILLEGAL_PARAMETER;
1192 1193 1194
		SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
		goto f_err;
		}
1195
#endif /* !OPENSSL_NO_DH */
B
Bodo Möller 已提交
1196 1197 1198 1199

#ifndef OPENSSL_NO_ECDH
	else if (alg & SSL_kECDHE)
		{
N
Nils Larsch 已提交
1200 1201 1202
		EC_GROUP *ngroup;
		const EC_GROUP *group;

B
Bodo Möller 已提交
1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215
		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 已提交
1216
		 * and the ECParameters in this case is just three bytes.
B
Bodo Möller 已提交
1217
		 */
B
Bodo Möller 已提交
1218
		param_len=3;
B
Bodo Möller 已提交
1219 1220
		if ((param_len > n) ||
		    (*p != NAMED_CURVE_TYPE) || 
B
Bodo Möller 已提交
1221
		    ((curve_nid = curve_id2nid(*(p + 2))) == 0)) 
B
Bodo Möller 已提交
1222 1223 1224 1225 1226 1227
			{
			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 已提交
1228 1229 1230 1231 1232 1233 1234
		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 已提交
1235 1236 1237 1238
			{
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
			goto err;
			}
N
Nils Larsch 已提交
1239 1240 1241
		EC_GROUP_free(ngroup);

		group = EC_KEY_get0_group(ecdh);
B
Bodo Möller 已提交
1242 1243

		if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
N
Nils Larsch 已提交
1244
		    (EC_GROUP_get_degree(group) > 163))
B
Bodo Möller 已提交
1245 1246 1247 1248 1249 1250
			{
			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 已提交
1251
		p+=3;
B
Bodo Möller 已提交
1252 1253

		/* Next, get the encoded ECPoint */
N
Nils Larsch 已提交
1254
		if (((srvr_ecpoint = EC_POINT_new(group)) == NULL) ||
B
Bodo Möller 已提交
1255 1256 1257 1258 1259 1260 1261 1262 1263 1264
		    ((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 已提交
1265
		    (EC_POINT_oct2point(group, srvr_ecpoint, 
B
Bodo Möller 已提交
1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289
			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 已提交
1290
		EC_KEY_set_public_key(ecdh, srvr_ecpoint);
B
Bodo Möller 已提交
1291 1292 1293
		s->session->sess_cert->peer_ecdh_tmp=ecdh;
		ecdh=NULL;
		BN_CTX_free(bn_ctx);
N
Nils Larsch 已提交
1294
		EC_POINT_free(srvr_ecpoint);
B
Bodo Möller 已提交
1295 1296 1297 1298 1299 1300 1301 1302 1303
		srvr_ecpoint = NULL;
		}
	else if (alg & SSL_kECDH)
		{
		al=SSL_AD_UNEXPECTED_MESSAGE;
		SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
		goto f_err;
		}
#endif /* !OPENSSL_NO_ECDH */
1304 1305 1306 1307 1308 1309 1310
	if (alg & SSL_aFZA)
		{
		al=SSL_AD_HANDSHAKE_FAILURE;
		SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
		goto f_err;
		}

1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323

	/* 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 */
1324
			al=SSL_AD_DECODE_ERROR;
1325
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_LENGTH);
1326
			goto f_err;
1327 1328
			}

1329
#ifndef OPENSSL_NO_RSA
1330 1331 1332 1333 1334 1335 1336 1337
		if (pkey->type == EVP_PKEY_RSA)
			{
			int num;

			j=0;
			q=md_buf;
			for (num=2; num > 0; num--)
				{
D
 
Dr. Stephen Henson 已提交
1338 1339
				EVP_DigestInit_ex(&md_ctx,(num == 2)
					?s->ctx->md5:s->ctx->sha1, NULL);
1340 1341 1342
				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 已提交
1343
				EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i);
1344 1345 1346
				q+=i;
				j+=i;
				}
1347 1348 1349
			i=RSA_verify(NID_md5_sha1, md_buf, j, p, n,
								pkey->pkey.rsa);
			if (i < 0)
1350
				{
1351
				al=SSL_AD_DECRYPT_ERROR;
1352 1353 1354
				SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
				goto f_err;
				}
1355
			if (i == 0)
1356 1357
				{
				/* bad signature */
1358
				al=SSL_AD_DECRYPT_ERROR;
1359 1360 1361 1362 1363 1364
				SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
				goto f_err;
				}
			}
		else
#endif
1365
#ifndef OPENSSL_NO_DSA
1366 1367 1368
			if (pkey->type == EVP_PKEY_DSA)
			{
			/* lets do DSS */
D
 
Dr. Stephen Henson 已提交
1369
			EVP_VerifyInit_ex(&md_ctx,EVP_dss1(), NULL);
1370 1371 1372 1373 1374 1375
			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 */
1376
				al=SSL_AD_DECRYPT_ERROR;
1377 1378 1379 1380 1381
				SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
				goto f_err;
				}
			}
		else
B
Bodo Möller 已提交
1382 1383
#endif
#ifndef OPENSSL_NO_ECDSA
1384
			if (pkey->type == EVP_PKEY_EC)
B
Bodo Möller 已提交
1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399
			{
			/* 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
1400 1401
#endif
			{
B
Bodo Möller 已提交
1402
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1403 1404 1405 1406 1407 1408 1409 1410
			goto err;
			}
		}
	else
		{
		/* still data left over */
		if (!(alg & SSL_aNULL))
			{
B
Bodo Möller 已提交
1411
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1412 1413 1414 1415
			goto err;
			}
		if (n != 0)
			{
1416
			al=SSL_AD_DECODE_ERROR;
1417 1418 1419 1420
			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_EXTRA_DATA_IN_MESSAGE);
			goto f_err;
			}
		}
1421
	EVP_PKEY_free(pkey);
1422
	EVP_MD_CTX_cleanup(&md_ctx);
1423 1424 1425 1426
	return(1);
f_err:
	ssl3_send_alert(s,SSL3_AL_FATAL,al);
err:
1427
	EVP_PKEY_free(pkey);
1428
#ifndef OPENSSL_NO_RSA
1429 1430 1431
	if (rsa != NULL)
		RSA_free(rsa);
#endif
1432
#ifndef OPENSSL_NO_DH
1433 1434
	if (dh != NULL)
		DH_free(dh);
B
Bodo Möller 已提交
1435 1436 1437 1438 1439 1440
#endif
#ifndef OPENSSL_NO_ECDH
	BN_CTX_free(bn_ctx);
	EC_POINT_free(srvr_ecpoint);
	if (ecdh != NULL)
		EC_KEY_free(ecdh);
1441
#endif
1442
	EVP_MD_CTX_cleanup(&md_ctx);
1443 1444 1445
	return(-1);
	}

B
Ben Laurie 已提交
1446
int ssl3_get_certificate_request(SSL *s)
1447 1448
	{
	int ok,ret=0;
1449 1450
	unsigned long n,nc,l;
	unsigned int llen,ctype_num,i;
1451
	X509_NAME *xn=NULL;
1452 1453
	const unsigned char *p,*q;
	unsigned char *d;
B
Ben Laurie 已提交
1454
	STACK_OF(X509_NAME) *ca_sk=NULL;
1455

B
Ben Laurie 已提交
1456
	n=s->method->ssl_get_message(s,
1457 1458 1459
		SSL3_ST_CR_CERT_REQ_A,
		SSL3_ST_CR_CERT_REQ_B,
		-1,
1460
		s->max_cert_list,
1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474
		&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)
		{
1475
		ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
1476 1477 1478 1479
		SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_WRONG_MESSAGE_TYPE);
		goto err;
		}

1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491
	/* 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;
			}
		}

1492
	p=d=(unsigned char *)s->init_msg;
1493

B
Ben Laurie 已提交
1494
	if ((ca_sk=sk_X509_NAME_new(ca_dn_cmp)) == NULL)
1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509
		{
		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);
1510 1511 1512 1513 1514 1515 1516 1517 1518
#if 0
{
FILE *out;
out=fopen("/tmp/vsign.der","w");
fwrite(p,1,llen,out);
fclose(out);
}
#endif

1519 1520
	if ((llen+ctype_num+2+1) != n)
		{
1521
		ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1522 1523 1524 1525 1526 1527 1528 1529 1530
		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)
			{
1531
			if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
1532
				goto cont; /* netscape bugs */
1533
			ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1534 1535 1536 1537 1538 1539 1540 1541
			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 已提交
1542
			/* If netscape tolerance is on, ignore errors */
1543
			if (s->options & SSL_OP_NETSCAPE_CA_DN_BUG)
1544 1545 1546
				goto cont;
			else
				{
1547
				ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1548 1549 1550 1551 1552 1553 1554
				SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_ASN1_LIB);
				goto err;
				}
			}

		if (q != (p+l))
			{
1555
			ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1556 1557 1558
			SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_LENGTH_MISMATCH);
			goto err;
			}
B
Ben Laurie 已提交
1559
		if (!sk_X509_NAME_push(ca_sk,xn))
1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574
			{
			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 已提交
1575
	/* we should setup a certificate to return.... */
1576 1577 1578
	s->s3->tmp.cert_req=1;
	s->s3->tmp.ctype_num=ctype_num;
	if (s->s3->tmp.ca_names != NULL)
B
Ben Laurie 已提交
1579
		sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
1580 1581 1582 1583 1584
	s->s3->tmp.ca_names=ca_sk;
	ca_sk=NULL;

	ret=1;
err:
B
Ben Laurie 已提交
1585
	if (ca_sk != NULL) sk_X509_NAME_pop_free(ca_sk,X509_NAME_free);
1586 1587 1588
	return(ret);
	}

1589
static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
1590 1591 1592 1593
	{
	return(X509_NAME_cmp(*a,*b));
	}

B
Ben Laurie 已提交
1594
int ssl3_get_server_done(SSL *s)
1595 1596 1597 1598
	{
	int ok,ret=0;
	long n;

B
Ben Laurie 已提交
1599
	n=s->method->ssl_get_message(s,
1600 1601 1602 1603 1604 1605 1606 1607 1608 1609
		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 */
1610
		ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
1611
		SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
1612
		return -1;
1613 1614 1615 1616 1617
		}
	ret=1;
	return(ret);
	}

1618

B
Ben Laurie 已提交
1619
int ssl3_send_client_key_exchange(SSL *s)
1620
	{
1621
	unsigned char *p,*d;
1622 1623
	int n;
	unsigned long l;
1624
#ifndef OPENSSL_NO_RSA
1625
	unsigned char *q;
1626
	EVP_PKEY *pkey=NULL;
1627
#endif
1628
#ifndef OPENSSL_NO_KRB5
1629
	KSSL_ERR kssl_err;
1630
#endif /* OPENSSL_NO_KRB5 */
B
Bodo Möller 已提交
1631 1632
#ifndef OPENSSL_NO_ECDH
	EC_KEY *clnt_ecdh = NULL;
N
Nils Larsch 已提交
1633
	const EC_POINT *srvr_ecpoint = NULL;
B
Bodo Möller 已提交
1634 1635 1636 1637 1638
	EVP_PKEY *srvr_pub_pkey = NULL;
	unsigned char *encodedPoint = NULL;
	int encoded_pt_len = 0;
	BN_CTX * bn_ctx = NULL;
#endif
1639 1640 1641 1642 1643 1644 1645 1646

	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;

1647 1648
		/* Fool emacs indentation */
		if (0) {}
1649
#ifndef OPENSSL_NO_RSA
1650
		else if (l & SSL_kRSA)
1651 1652
			{
			RSA *rsa;
1653
			unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
1654

1655 1656
			if (s->session->sess_cert->peer_rsa_tmp != NULL)
				rsa=s->session->sess_cert->peer_rsa_tmp;
1657 1658
			else
				{
1659
				pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
1660 1661 1662 1663
				if ((pkey == NULL) ||
					(pkey->type != EVP_PKEY_RSA) ||
					(pkey->pkey.rsa == NULL))
					{
B
Bodo Möller 已提交
1664
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
1665 1666 1667
					goto err;
					}
				rsa=pkey->pkey.rsa;
B
Bodo Möller 已提交
1668
				EVP_PKEY_free(pkey);
1669 1670
				}
				
1671 1672
			tmp_buf[0]=s->client_version>>8;
			tmp_buf[1]=s->client_version&0xff;
1673
			if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
1674
					goto err;
1675

1676
			s->session->master_key_length=sizeof tmp_buf;
1677

1678 1679 1680 1681
			q=p;
			/* Fix buf for TLS and beyond */
			if (s->version > SSL3_VERSION)
				p+=2;
1682
			n=RSA_public_encrypt(sizeof tmp_buf,
1683
				tmp_buf,p,rsa,RSA_PKCS1_PADDING);
1684 1685 1686 1687
#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
1688 1689 1690 1691 1692 1693
			if (n <= 0)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_ENCRYPT);
				goto err;
				}

1694 1695 1696 1697 1698 1699 1700
			/* Fix buf for TLS and beyond */
			if (s->version > SSL3_VERSION)
				{
				s2n(n,q);
				n+=2;
				}

1701
			s->session->master_key_length=
1702
				s->method->ssl3_enc->generate_master_secret(s,
1703
					s->session->master_key,
1704
					tmp_buf,sizeof tmp_buf);
1705
			OPENSSL_cleanse(tmp_buf,sizeof tmp_buf);
1706
			}
1707
#endif
1708
#ifndef OPENSSL_NO_KRB5
1709
		else if (l & SSL_kKRB5)
1710 1711 1712 1713 1714 1715
			{
			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;
1716 1717 1718 1719 1720 1721 1722
			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);
1723

D
 
Dr. Stephen Henson 已提交
1724 1725
			EVP_CIPHER_CTX_init(&ciph_ctx);

1726
#ifdef KSSL_DEBUG
1727 1728
			printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
			        l, SSL_kKRB5);
1729 1730
#endif	/* KSSL_DEBUG */

1731 1732 1733 1734 1735
			authp = NULL;
#ifdef KRB5SENDAUTH
			if (KRB5SENDAUTH)  authp = &authenticator;
#endif	/* KRB5SENDAUTH */

1736
			krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
1737 1738
				&kssl_err);
			enc = kssl_map_enc(kssl_ctx->enctype);
1739 1740
			if (enc == NULL)
			    goto err;
1741
#ifdef KSSL_DEBUG
1742 1743 1744
			{
			printf("kssl_cget_tkt rtn %d\n", krb5rc);
			if (krb5rc && kssl_err.text)
1745
			  printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
1746
			}
1747 1748
#endif	/* KSSL_DEBUG */

1749 1750 1751
			if (krb5rc)
				{
				ssl3_send_alert(s,SSL3_AL_FATAL,
1752
						SSL_AD_HANDSHAKE_FAILURE);
1753
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
1754
						kssl_err.reason);
1755 1756
				goto err;
				}
1757

1758 1759 1760
			/*  20010406 VRS - Earlier versions used KRB5 AP_REQ
			**  in place of RFC 2712 KerberosWrapper, as in:
			**
1761 1762 1763 1764 1765 1766
			**  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);
			**
1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800
			**  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;
				}
 
1801
			if (RAND_bytes(tmp_buf,sizeof tmp_buf) <= 0)
1802 1803 1804
			    goto err;

			/*  20010420 VRS.  Tried it this way; failed.
1805
			**	EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,NULL);
1806 1807
			**	EVP_CIPHER_CTX_set_key_length(&ciph_ctx,
			**				kssl_ctx->length);
1808
			**	EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
1809 1810
			*/

1811
			memset(iv, 0, sizeof iv);  /* per RFC 1510 */
1812 1813
			EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,
				kssl_ctx->key,iv);
1814
			EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
1815
				sizeof tmp_buf);
1816
			EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
1817
			outl += padl;
B
Bodo Möller 已提交
1818 1819 1820 1821 1822
			if (outl > sizeof epms)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
				goto err;
				}
1823 1824 1825 1826 1827 1828 1829 1830
			EVP_CIPHER_CTX_cleanup(&ciph_ctx);

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

1831 1832
			s->session->master_key_length=
			        s->method->ssl3_enc->generate_master_secret(s,
1833
					s->session->master_key,
1834
					tmp_buf, sizeof tmp_buf);
1835

1836 1837
			OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
			OPENSSL_cleanse(epms, outl);
1838
			}
1839
#endif
1840
#ifndef OPENSSL_NO_DH
1841
		else if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
1842 1843 1844
			{
			DH *dh_srvr,*dh_clnt;

1845 1846
			if (s->session->sess_cert->peer_dh_tmp != NULL)
				dh_srvr=s->session->sess_cert->peer_dh_tmp;
1847 1848 1849
			else
				{
				/* we get them from the cert */
1850
				ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868
				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 */
1869

1870
			n=DH_compute_key(p,dh_srvr->pub_key,dh_clnt);
1871

1872 1873 1874 1875 1876 1877 1878 1879
			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=
1880
				s->method->ssl3_enc->generate_master_secret(s,
1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895
					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 已提交
1896 1897 1898 1899

#ifndef OPENSSL_NO_ECDH 
		else if ((l & SSL_kECDH) || (l & SSL_kECDHE))
			{
N
Nils Larsch 已提交
1900 1901
			const EC_GROUP *srvr_group = NULL;
			EC_KEY *tkey;
B
Bodo Möller 已提交
1902
			int ecdh_clnt_cert = 0;
1903
			int field_size = 0;
B
Bodo Möller 已提交
1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927

			/* 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 已提交
1928
				 *      EVP_PKEY_EC) && ...)
B
Bodo Möller 已提交
1929 1930 1931 1932 1933 1934
				 * ecdh_clnt_cert = 1;
				 */
				}

			if (s->session->sess_cert->peer_ecdh_tmp != NULL)
				{
N
Nils Larsch 已提交
1935
				tkey = s->session->sess_cert->peer_ecdh_tmp;
B
Bodo Möller 已提交
1936 1937 1938 1939 1940 1941 1942
				}
			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) ||
1943
				    (srvr_pub_pkey->type != EVP_PKEY_EC) ||
N
Nils Larsch 已提交
1944
				    (srvr_pub_pkey->pkey.ec == NULL))
B
Bodo Möller 已提交
1945 1946 1947 1948 1949 1950
					{
					SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
					    ERR_R_INTERNAL_ERROR);
					goto err;
					}

N
Nils Larsch 已提交
1951
				tkey = srvr_pub_pkey->pkey.ec;
B
Bodo Möller 已提交
1952 1953
				}

N
Nils Larsch 已提交
1954 1955 1956
			srvr_group   = EC_KEY_get0_group(tkey);
			srvr_ecpoint = EC_KEY_get0_public_key(tkey);

B
Bodo Möller 已提交
1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969
			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 已提交
1970 1971 1972 1973 1974
			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 已提交
1975 1976
			if (ecdh_clnt_cert) 
				{ 
1977
				/* Reuse key info from our certificate
B
Bodo Möller 已提交
1978 1979 1980
				 * We only need our private key to perform
				 * the ECDH computation.
				 */
N
Nils Larsch 已提交
1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993
				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 已提交
1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004
				}
			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;
					}
				}

2005 2006
			/* use the 'p' output buffer for the ECDH key, but
			 * make sure to clear it out afterwards
B
Bodo Möller 已提交
2007 2008
			 */

N
Nils Larsch 已提交
2009
			field_size = EC_GROUP_get_degree(srvr_group);
2010 2011 2012 2013 2014 2015
			if (field_size <= 0)
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
				       ERR_R_ECDH_LIB);
				goto err;
				}
B
Bodo Möller 已提交
2016
			n=ECDH_compute_key(p, (field_size+7)/8, srvr_ecpoint, clnt_ecdh, NULL);
B
Bodo Möller 已提交
2017
			if (n <= 0)
2018 2019
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
B
Bodo Möller 已提交
2020
				       ERR_R_ECDH_LIB);
2021
				goto err;
B
Bodo Möller 已提交
2022 2023
				}

2024 2025
			/* generate master key from the result */
			s->session->master_key_length = s->method->ssl3_enc \
B
Bodo Möller 已提交
2026 2027 2028 2029
			    -> generate_master_secret(s, 
				s->session->master_key,
				p, n);

2030
			memset(p, 0, n); /* clean up */
B
Bodo Möller 已提交
2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042

			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 已提交
2043 2044
				    EC_POINT_point2oct(srvr_group, 
					EC_KEY_get0_public_key(clnt_ecdh), 
B
Bodo Möller 已提交
2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059
					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 已提交
2060 2061
				n = EC_POINT_point2oct(srvr_group, 
				    EC_KEY_get0_public_key(clnt_ecdh), 
B
Bodo Möller 已提交
2062 2063 2064 2065
				    POINT_CONVERSION_UNCOMPRESSED, 
				    encodedPoint, encoded_pt_len, bn_ctx);

				*p = n; /* length of encoded point */
2066
				/* Encoded point will be copied here */
B
Bodo Möller 已提交
2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081
				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 */
2082
		else
2083
			{
B
Bodo Möller 已提交
2084 2085 2086 2087
			ssl3_send_alert(s, SSL3_AL_FATAL,
			    SSL_AD_HANDSHAKE_FAILURE);
			SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
			    ERR_R_INTERNAL_ERROR);
2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102
			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 已提交
2103 2104 2105 2106 2107
#ifndef OPENSSL_NO_ECDH
	BN_CTX_free(bn_ctx);
	if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
	if (clnt_ecdh != NULL) 
		EC_KEY_free(clnt_ecdh);
2108
	EVP_PKEY_free(srvr_pub_pkey);
B
Bodo Möller 已提交
2109
#endif
2110 2111 2112
	return(-1);
	}

B
Ben Laurie 已提交
2113
int ssl3_send_client_verify(SSL *s)
2114 2115 2116 2117
	{
	unsigned char *p,*d;
	unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
	EVP_PKEY *pkey;
2118
#ifndef OPENSSL_NO_RSA
B
Ben Laurie 已提交
2119
	unsigned u=0;
2120
#endif
2121
	unsigned long n;
N
make  
Nils Larsch 已提交
2122
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
2123 2124
	int j;
#endif
2125 2126 2127 2128 2129 2130 2131

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

2132 2133
		s->method->ssl3_enc->cert_verify_mac(s,&(s->s3->finish_dgst2),
			&(data[MD5_DIGEST_LENGTH]));
2134

2135
#ifndef OPENSSL_NO_RSA
2136 2137
		if (pkey->type == EVP_PKEY_RSA)
			{
2138 2139
			s->method->ssl3_enc->cert_verify_mac(s,
				&(s->s3->finish_dgst1),&(data[0]));
2140 2141
			if (RSA_sign(NID_md5_sha1, data,
					 MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
B
Ben Laurie 已提交
2142
					&(p[2]), &u, pkey->pkey.rsa) <= 0 )
2143 2144 2145 2146
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB);
				goto err;
				}
B
Ben Laurie 已提交
2147 2148
			s2n(u,p);
			n=u+2;
2149 2150 2151
			}
		else
#endif
2152
#ifndef OPENSSL_NO_DSA
2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166
			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 已提交
2167 2168
#endif
#ifndef OPENSSL_NO_ECDSA
2169
			if (pkey->type == EVP_PKEY_EC)
B
Bodo Möller 已提交
2170 2171 2172 2173
			{
			if (!ECDSA_sign(pkey->save_type,
				&(data[MD5_DIGEST_LENGTH]),
				SHA_DIGEST_LENGTH,&(p[2]),
N
Nils Larsch 已提交
2174
				(unsigned int *)&j,pkey->pkey.ec))
B
Bodo Möller 已提交
2175 2176 2177 2178 2179 2180 2181 2182 2183
				{
				SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
				    ERR_R_ECDSA_LIB);
				goto err;
				}
			s2n(j,p);
			n=j+2;
			}
		else
2184 2185
#endif
			{
B
Bodo Möller 已提交
2186
			SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_INTERNAL_ERROR);
2187 2188 2189 2190 2191
			goto err;
			}
		*(d++)=SSL3_MT_CERTIFICATE_VERIFY;
		l2n3(n,d);

2192
		s->state=SSL3_ST_CW_CERT_VRFY_B;
2193 2194 2195 2196 2197 2198 2199 2200
		s->init_num=(int)n+4;
		s->init_off=0;
		}
	return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
err:
	return(-1);
	}

B
Ben Laurie 已提交
2201
int ssl3_send_client_certificate(SSL *s)
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
	{
	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)
			{
2250 2251 2252 2253 2254 2255 2256 2257 2258 2259
			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;
				}
2260 2261 2262 2263 2264 2265 2266 2267 2268
			}

		/* 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;
2269 2270
		l=ssl3_output_cert_chain(s,
			(s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
2271 2272 2273 2274 2275 2276 2277 2278 2279
		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 已提交
2280
int ssl3_check_cert_and_algorithm(SSL *s)
2281 2282 2283 2284
	{
	int i,idx;
	long algs;
	EVP_PKEY *pkey=NULL;
2285
	SESS_CERT *sc;
2286
#ifndef OPENSSL_NO_RSA
2287
	RSA *rsa;
2288
#endif
2289
#ifndef OPENSSL_NO_DH
2290
	DH *dh;
2291
#endif
2292

2293
	sc=s->session->sess_cert;
2294

2295
	if (sc == NULL)
2296
		{
B
Bodo Möller 已提交
2297
		SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
2298 2299 2300 2301 2302 2303
		goto err;
		}

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

	/* we don't have a certificate */
2304
	if (algs & (SSL_aDH|SSL_aNULL|SSL_aKRB5))
2305 2306
		return(1);

2307
#ifndef OPENSSL_NO_RSA
2308
	rsa=s->session->sess_cert->peer_rsa_tmp;
2309
#endif
2310
#ifndef OPENSSL_NO_DH
2311
	dh=s->session->sess_cert->peer_dh_tmp;
2312
#endif
2313 2314 2315

	/* This is the passed certificate */

2316
	idx=sc->peer_cert_type;
B
Bodo Möller 已提交
2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331
#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
2332 2333
	pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509);
	i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey);
2334
	EVP_PKEY_free(pkey);
2335 2336 2337 2338 2339 2340 2341 2342

	
	/* 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;
		}
2343
#ifndef OPENSSL_NO_DSA
2344 2345 2346 2347 2348 2349
	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
2350
#ifndef OPENSSL_NO_RSA
2351 2352 2353 2354 2355 2356
	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;
		}
2357
#endif
2358
#ifndef OPENSSL_NO_DH
2359
	if ((algs & SSL_kEDH) &&
2360 2361 2362 2363 2364 2365 2366 2367 2368 2369
		!(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;
		}
2370
#ifndef OPENSSL_NO_DSA
2371 2372 2373 2374 2375 2376 2377 2378
	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

2379
	if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i,EVP_PKT_EXP))
2380
		{
2381
#ifndef OPENSSL_NO_RSA
2382 2383
		if (algs & SSL_kRSA)
			{
2384
			if (rsa == NULL
2385
			    || RSA_size(rsa)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
2386 2387 2388 2389 2390 2391 2392
				{
				SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
				goto f_err;
				}
			}
		else
#endif
2393
#ifndef OPENSSL_NO_DH
2394
			if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
2395 2396
			    {
			    if (dh == NULL
2397
				|| DH_size(dh)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411
				{
				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:
2412
	ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
2413 2414 2415 2416
err:
	return(0);
	}

B
Bodo Möller 已提交
2417 2418 2419 2420 2421

#ifndef OPENSSL_NO_ECDH
/* This is the complement of nid2curve_id in s3_srvr.c. */
static int curve_id2nid(int curve_id)
{
2422 2423
	/* ECC curves from draft-ietf-tls-ecc-01.txt (Mar 15, 2001)
	 * (no changes in draft-ietf-tls-ecc-03.txt [June 2003]) */
B
Bodo Möller 已提交
2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458
	static int nid_list[26] =
	{
		0,
		NID_sect163k1, /* sect163k1 (1) */
		NID_sect163r1, /* sect163r1 (2) */
		NID_sect163r2, /* sect163r2 (3) */
		NID_sect193r1, /* sect193r1 (4) */ 
		NID_sect193r2, /* sect193r2 (5) */ 
		NID_sect233k1, /* sect233k1 (6) */
		NID_sect233r1, /* sect233r1 (7) */ 
		NID_sect239k1, /* sect239k1 (8) */ 
		NID_sect283k1, /* sect283k1 (9) */
		NID_sect283r1, /* sect283r1 (10) */ 
		NID_sect409k1, /* sect409k1 (11) */ 
		NID_sect409r1, /* sect409r1 (12) */
		NID_sect571k1, /* sect571k1 (13) */ 
		NID_sect571r1, /* sect571r1 (14) */ 
		NID_secp160k1, /* secp160k1 (15) */
		NID_secp160r1, /* secp160r1 (16) */ 
		NID_secp160r2, /* secp160r2 (17) */ 
		NID_secp192k1, /* secp192k1 (18) */
		NID_X9_62_prime192v1, /* secp192r1 (19) */ 
		NID_secp224k1, /* secp224k1 (20) */ 
		NID_secp224r1, /* secp224r1 (21) */
		NID_secp256k1, /* secp256k1 (22) */ 
		NID_X9_62_prime256v1, /* secp256r1 (23) */ 
		NID_secp384r1, /* secp384r1 (24) */
		NID_secp521r1  /* secp521r1 (25) */	
	};
	
	if ((curve_id < 1) || (curve_id > 25)) return 0;

	return nid_list[curve_id];
}
#endif