1998-12-21 10:52:47 +00:00
|
|
|
/* ssl/s3_clnt.c */
|
1998-12-21 10:56:39 +00:00
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
1998-12-21 10:52:47 +00:00
|
|
|
* 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.]
|
|
|
|
*/
|
2002-01-14 23:40:26 +00:00
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* 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).
|
|
|
|
*
|
|
|
|
*/
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
2002-07-10 06:57:54 +00:00
|
|
|
#include "ssl_locl.h"
|
|
|
|
#include "kssl_lcl.h"
|
1999-04-23 22:13:45 +00:00
|
|
|
#include <openssl/buffer.h>
|
|
|
|
#include <openssl/rand.h>
|
|
|
|
#include <openssl/objects.h>
|
|
|
|
#include <openssl/evp.h>
|
2001-07-30 23:57:25 +00:00
|
|
|
#include <openssl/md5.h>
|
2002-07-30 11:21:19 +00:00
|
|
|
#include "cryptlib.h"
|
2000-11-30 22:53:34 +00:00
|
|
|
|
1999-01-31 17:30:18 +00:00
|
|
|
static SSL_METHOD *ssl3_get_client_method(int ver);
|
1998-12-21 10:52:47 +00:00
|
|
|
static int ssl3_client_hello(SSL *s);
|
|
|
|
static int ssl3_get_server_hello(SSL *s);
|
|
|
|
static int ssl3_get_certificate_request(SSL *s);
|
2000-06-01 02:36:58 +00:00
|
|
|
static int ca_dn_cmp(const X509_NAME * const *a,const X509_NAME * const *b);
|
1998-12-21 10:52:47 +00:00
|
|
|
static int ssl3_get_server_done(SSL *s);
|
|
|
|
static int ssl3_send_client_verify(SSL *s);
|
|
|
|
static int ssl3_send_client_certificate(SSL *s);
|
|
|
|
static int ssl3_send_client_key_exchange(SSL *s);
|
|
|
|
static int ssl3_get_key_exchange(SSL *s);
|
|
|
|
static int ssl3_get_server_certificate(SSL *s);
|
|
|
|
static int ssl3_check_cert_and_algorithm(SSL *s);
|
1999-04-19 21:31:43 +00:00
|
|
|
static SSL_METHOD *ssl3_get_client_method(int ver)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
if (ver == SSL3_VERSION)
|
1998-12-21 10:52:47 +00:00
|
|
|
return(SSLv3_client_method());
|
|
|
|
else
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
SSL_METHOD *SSLv3_client_method(void)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
static int init=1;
|
|
|
|
static SSL_METHOD SSLv3_client_data;
|
|
|
|
|
|
|
|
if (init)
|
|
|
|
{
|
2002-09-23 14:28:12 +00:00
|
|
|
CRYPTO_w_lock(CRYPTO_LOCK_SSL_METHOD);
|
|
|
|
|
2002-09-25 15:38:17 +00:00
|
|
|
if (init)
|
|
|
|
{
|
|
|
|
memcpy((char *)&SSLv3_client_data,(char *)sslv3_base_method(),
|
|
|
|
sizeof(SSL_METHOD));
|
|
|
|
SSLv3_client_data.ssl_connect=ssl3_connect;
|
|
|
|
SSLv3_client_data.get_ssl_method=ssl3_get_client_method;
|
|
|
|
init=0;
|
|
|
|
}
|
2002-09-23 14:28:12 +00:00
|
|
|
|
|
|
|
CRYPTO_w_unlock(CRYPTO_LOCK_SSL_METHOD);
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
return(&SSLv3_client_data);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int ssl3_connect(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
BUF_MEM *buf;
|
|
|
|
unsigned long Time=time(NULL),l;
|
|
|
|
long num1;
|
2002-01-12 15:56:13 +00:00
|
|
|
void (*cb)(const SSL *ssl,int type,int val)=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
int ret= -1;
|
|
|
|
int new_state,state,skip=0;;
|
|
|
|
|
2000-01-13 20:59:17 +00:00
|
|
|
RAND_add(&Time,sizeof(Time),0);
|
1998-12-21 10:52:47 +00:00
|
|
|
ERR_clear_error();
|
1998-12-21 10:56:39 +00:00
|
|
|
clear_sys_error();
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
if (s->info_callback != NULL)
|
|
|
|
cb=s->info_callback;
|
|
|
|
else if (s->ctx->info_callback != NULL)
|
|
|
|
cb=s->ctx->info_callback;
|
|
|
|
|
|
|
|
s->in_handshake++;
|
2001-10-24 19:03:22 +00:00
|
|
|
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
state=s->state;
|
|
|
|
|
|
|
|
switch(s->state)
|
|
|
|
{
|
|
|
|
case SSL_ST_RENEGOTIATE:
|
|
|
|
s->new_session=1;
|
|
|
|
s->state=SSL_ST_CONNECT;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
s->ctx->stats.sess_connect_renegotiate++;
|
1998-12-21 10:52:47 +00:00
|
|
|
/* break */
|
|
|
|
case SSL_ST_BEFORE:
|
|
|
|
case SSL_ST_CONNECT:
|
|
|
|
case SSL_ST_BEFORE|SSL_ST_CONNECT:
|
|
|
|
case SSL_ST_OK|SSL_ST_CONNECT:
|
|
|
|
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
s->server=0;
|
1998-12-21 10:52:47 +00:00
|
|
|
if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
if ((s->version & 0xff00 ) != 0x0300)
|
2000-09-04 15:34:43 +00:00
|
|
|
{
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_CONNECT, ERR_R_INTERNAL_ERROR);
|
2000-09-04 15:34:43 +00:00
|
|
|
ret = -1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
/* s->version=SSL3_VERSION; */
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ssl3_setup_buffers(s)) { ret= -1; goto end; }
|
|
|
|
|
|
|
|
/* setup buffing BIO */
|
1998-12-21 10:56:39 +00:00
|
|
|
if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* don't push the buffering BIO quite yet */
|
|
|
|
|
|
|
|
ssl3_init_finished_mac(s);
|
|
|
|
|
|
|
|
s->state=SSL3_ST_CW_CLNT_HELLO_A;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
s->ctx->stats.sess_connect++;
|
1998-12-21 10:52:47 +00:00
|
|
|
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 */
|
1998-12-21 10:56:39 +00:00
|
|
|
if (s->bbio != s->wbio)
|
|
|
|
s->wbio=BIO_push(s->bbio,s->wbio);
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
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:
|
|
|
|
/* Check if it is anon DH */
|
|
|
|
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:
|
1999-06-12 01:03:40 +00:00
|
|
|
case SSL3_ST_CW_CERT_D:
|
1998-12-21 10:52:47 +00:00
|
|
|
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 */
|
1998-12-21 10:56:39 +00:00
|
|
|
/* For TLS, cert_req is set to 2, so a cert chain
|
|
|
|
* of nothing is sent, but no verify packet is sent */
|
|
|
|
if (s->s3->tmp.cert_req == 1)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
if (s->s3->tmp.new_compression == NULL)
|
|
|
|
s->session->compress_meth=0;
|
|
|
|
else
|
|
|
|
s->session->compress_meth=
|
|
|
|
s->s3->tmp.new_compression->id;
|
1998-12-21 10:56:39 +00:00
|
|
|
if (!s->method->ssl3_enc->setup_key_block(s))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
ret= -1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
if (!s->method->ssl3_enc->change_cipher_state(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
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,
|
2000-01-05 23:11:51 +00:00
|
|
|
s->method->ssl3_enc->client_finished_label,
|
|
|
|
s->method->ssl3_enc->client_finished_label_len);
|
1998-12-21 10:52:47 +00:00
|
|
|
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,
|
1998-12-21 10:56:39 +00:00
|
|
|
SSL3_ST_CR_FINISHED_B);
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
|
|
|
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
if (s->init_buf != NULL)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
BUF_MEM_free(s->init_buf);
|
|
|
|
s->init_buf=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
|
|
|
|
/* 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 */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
s->init_num=0;
|
|
|
|
s->new_session=0;
|
|
|
|
|
|
|
|
ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
if (s->hit) s->ctx->stats.sess_hit++;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
ret=1;
|
|
|
|
/* s->server=0; */
|
|
|
|
s->handshake_func=ssl3_connect;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
s->ctx->stats.sess_connect_good++;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
|
|
|
|
|
|
|
|
goto end;
|
1998-12-21 11:00:56 +00:00
|
|
|
/* break; */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
if (s->debug)
|
|
|
|
{
|
|
|
|
if ((ret=BIO_flush(s->wbio)) <= 0)
|
|
|
|
goto end;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
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:
|
2001-10-25 08:17:53 +00:00
|
|
|
s->in_handshake--;
|
1998-12-21 10:52:47 +00:00
|
|
|
if (cb != NULL)
|
|
|
|
cb(s,SSL_CB_CONNECT_EXIT,ret);
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_client_hello(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
unsigned char *buf;
|
|
|
|
unsigned char *p,*d;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
int i,j;
|
1998-12-21 10:52:47 +00:00
|
|
|
unsigned long Time,l;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
SSL_COMP *comp;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
buf=(unsigned char *)s->init_buf->data;
|
|
|
|
if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
|
|
|
|
{
|
|
|
|
if ((s->session == NULL) ||
|
1998-12-21 11:00:56 +00:00
|
|
|
(s->session->ssl_version != s->version) ||
|
|
|
|
(s->session->not_resumable))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
if (!ssl_get_new_session(s,0))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* else use the pre-loaded session */
|
|
|
|
|
|
|
|
p=s->s3->client_random;
|
|
|
|
Time=time(NULL); /* Time */
|
|
|
|
l2n(Time,p);
|
2000-01-21 01:15:56 +00:00
|
|
|
RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-sizeof(Time));
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* Do the message type and length last */
|
|
|
|
d=p= &(buf[4]);
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
*(p++)=s->version>>8;
|
|
|
|
*(p++)=s->version&0xff;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
s->client_version=s->version;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
2002-08-02 11:47:24 +00:00
|
|
|
if (i > sizeof s->session->session_id)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
memcpy(p,s->session->session_id,i);
|
|
|
|
p+=i;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ciphers supported */
|
|
|
|
i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]));
|
|
|
|
if (i == 0)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
s2n(i,p);
|
|
|
|
p+=i;
|
|
|
|
|
1998-12-21 11:00:56 +00:00
|
|
|
/* COMPRESSION */
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
if (s->ctx->comp_methods == NULL)
|
|
|
|
j=0;
|
|
|
|
else
|
1999-04-12 17:23:57 +00:00
|
|
|
j=sk_SSL_COMP_num(s->ctx->comp_methods);
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
*(p++)=1+j;
|
|
|
|
for (i=0; i<j; i++)
|
|
|
|
{
|
1999-04-12 17:23:57 +00:00
|
|
|
comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
*(p++)=comp->id;
|
|
|
|
}
|
|
|
|
*(p++)=0; /* Add the NULL method */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_get_server_hello(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-04-12 17:23:57 +00:00
|
|
|
STACK_OF(SSL_CIPHER) *sk;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSL_CIPHER *c;
|
|
|
|
unsigned char *p,*d;
|
|
|
|
int i,al,ok;
|
|
|
|
unsigned int j;
|
|
|
|
long n;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
SSL_COMP *comp;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
n=ssl3_get_message(s,
|
|
|
|
SSL3_ST_CR_SRVR_HELLO_A,
|
|
|
|
SSL3_ST_CR_SRVR_HELLO_B,
|
|
|
|
SSL3_MT_SERVER_HELLO,
|
|
|
|
300, /* ?? */
|
|
|
|
&ok);
|
|
|
|
|
|
|
|
if (!ok) return((int)n);
|
2001-10-15 19:49:25 +00:00
|
|
|
d=p=(unsigned char *)s->init_msg;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
if ((p[0] != (s->version>>8)) || (p[1] != (s->version&0xff)))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_SSL_VERSION);
|
1998-12-21 10:56:39 +00:00
|
|
|
s->version=(s->version&0xff00)|p[1];
|
|
|
|
al=SSL_AD_PROTOCOL_VERSION;
|
|
|
|
goto f_err;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
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++);
|
|
|
|
|
2002-09-20 08:37:13 +00:00
|
|
|
if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2002-09-20 08:37:13 +00:00
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SSL3_SESSION_ID_TOO_LONG);
|
|
|
|
goto f_err;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2002-11-12 13:23:40 +00:00
|
|
|
|
1999-03-22 12:22:14 +00:00
|
|
|
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))
|
|
|
|
{
|
2002-09-20 08:37:13 +00:00
|
|
|
/* actually a client application bug */
|
1999-03-22 12:22:14 +00:00
|
|
|
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;
|
|
|
|
}
|
1998-12-21 10:56:39 +00:00
|
|
|
else /* a miss or crap from the other end */
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
/* If we were trying for session-id reuse, make a new
|
|
|
|
* SSL_SESSION so we don't stuff up other people */
|
1998-12-21 10:52:47 +00:00
|
|
|
s->hit=0;
|
1998-12-21 10:56:39 +00:00
|
|
|
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 */
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
p+=j;
|
|
|
|
c=ssl_get_cipher_by_char(s,p);
|
|
|
|
if (c == NULL)
|
|
|
|
{
|
|
|
|
/* unknown cipher */
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
1999-04-12 17:23:57 +00:00
|
|
|
i=sk_SSL_CIPHER_find(sk,c);
|
1998-12-21 10:52:47 +00:00
|
|
|
if (i < 0)
|
|
|
|
{
|
|
|
|
/* we did not say we would use this cipher */
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
|
2002-11-20 10:46:35 +00:00
|
|
|
/* 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;
|
2002-11-15 10:51:40 +00:00
|
|
|
if (s->hit && (s->session->cipher_id != c->id))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
if (!(s->options &
|
1998-12-21 10:52:47 +00:00
|
|
|
SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
1998-12-21 10:52:47 +00:00
|
|
|
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 */
|
1998-12-21 11:00:56 +00:00
|
|
|
/* COMPRESSION */
|
1998-12-21 10:52:47 +00:00
|
|
|
j= *(p++);
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
if (j == 0)
|
|
|
|
comp=NULL;
|
|
|
|
else
|
|
|
|
comp=ssl3_comp_find(s->ctx->comp_methods,j);
|
|
|
|
|
|
|
|
if ((j != 0) && (comp == NULL))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
|
|
|
|
goto f_err;
|
|
|
|
}
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
s->s3->tmp.new_compression=comp;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
if (p != (d+n))
|
|
|
|
{
|
|
|
|
/* wrong packet length */
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_get_server_certificate(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int al,i,ok,ret= -1;
|
|
|
|
unsigned long n,nc,llen,l;
|
|
|
|
X509 *x=NULL;
|
|
|
|
unsigned char *p,*d,*q;
|
1999-04-12 17:23:57 +00:00
|
|
|
STACK_OF(X509) *sk=NULL;
|
1999-05-13 15:09:38 +00:00
|
|
|
SESS_CERT *sc;
|
1998-12-21 10:52:47 +00:00
|
|
|
EVP_PKEY *pkey=NULL;
|
2000-11-30 22:53:34 +00:00
|
|
|
int need_cert = 1; /* VRS: 0=> will allow null cert if auth == KRB5 */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
n=ssl3_get_message(s,
|
|
|
|
SSL3_ST_CR_CERT_A,
|
|
|
|
SSL3_ST_CR_CERT_B,
|
|
|
|
-1,
|
2001-09-11 13:08:51 +00:00
|
|
|
s->max_cert_list,
|
1998-12-21 10:52:47 +00:00
|
|
|
&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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_UNEXPECTED_MESSAGE;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_BAD_MESSAGE_TYPE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
2001-10-15 19:49:25 +00:00
|
|
|
d=p=(unsigned char *)s->init_msg;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-04-12 17:23:57 +00:00
|
|
|
if ((sk=sk_X509_new_null()) == NULL)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
n2l3(p,llen);
|
|
|
|
if (llen+3 != n)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_BAD_CERTIFICATE;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_ASN1_LIB);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (q != (p+l))
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
1999-04-12 17:23:57 +00:00
|
|
|
if (!sk_X509_push(sk,x))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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);
|
2001-07-12 08:51:47 +00:00
|
|
|
if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
|
|
|
|
#ifndef OPENSSL_NO_KRB5
|
|
|
|
&& (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
|
|
|
|
!= (SSL_aKRB5|SSL_kKRB5)
|
|
|
|
#endif /* OPENSSL_NO_KRB5 */
|
|
|
|
)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
al=ssl_verify_alarm_type(s->verify_result);
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
|
|
|
|
goto f_err;
|
|
|
|
}
|
2000-05-27 22:25:01 +00:00
|
|
|
ERR_clear_error(); /* but we keep s->verify_result */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
sc=ssl_sess_cert_new();
|
|
|
|
if (sc == NULL) goto err;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
if (s->session->sess_cert) ssl_sess_cert_free(s->session->sess_cert);
|
|
|
|
s->session->sess_cert=sc;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
sc->cert_chain=sk;
|
2000-03-27 18:07:45 +00:00
|
|
|
/* Inconsistency alert: cert_chain does include the peer's
|
|
|
|
* certificate, which we don't include in s3_srvr.c */
|
1999-04-12 17:23:57 +00:00
|
|
|
x=sk_X509_value(sk,0);
|
1998-12-21 10:52:47 +00:00
|
|
|
sk=NULL;
|
2001-07-09 21:46:58 +00:00
|
|
|
/* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
pkey=X509_get_pubkey(x);
|
|
|
|
|
2000-11-30 22:53:34 +00:00
|
|
|
/* VRS: allow null cert if auth == KRB5 */
|
2001-07-09 21:46:58 +00:00
|
|
|
need_cert = ((s->s3->tmp.new_cipher->algorithms
|
|
|
|
& (SSL_MKEY_MASK|SSL_AUTH_MASK))
|
2000-11-30 22:53:34 +00:00
|
|
|
== (SSL_aKRB5|SSL_kKRB5))? 0: 1;
|
|
|
|
|
|
|
|
#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,
|
|
|
|
s->s3->tmp.new_cipher->algorithms, need_cert);
|
|
|
|
#endif /* KSSL_DEBUG */
|
|
|
|
|
2001-07-09 21:46:58 +00:00
|
|
|
if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey)))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
x=NULL;
|
|
|
|
al=SSL3_AL_FATAL;
|
2001-07-09 21:46:58 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
|
|
|
|
SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
|
|
|
|
i=ssl_cert_type(x,pkey);
|
2000-11-30 22:53:34 +00:00
|
|
|
if (need_cert && i < 0)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
x=NULL;
|
|
|
|
al=SSL3_AL_FATAL;
|
2001-07-09 21:46:58 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
|
|
|
|
SSL_R_UNKNOWN_CERTIFICATE_TYPE);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
|
2000-11-30 22:53:34 +00:00
|
|
|
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;
|
|
|
|
}
|
2000-11-29 16:04:38 +00:00
|
|
|
s->session->verify_result = s->verify_result;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
x=NULL;
|
|
|
|
ret=1;
|
|
|
|
|
|
|
|
if (0)
|
|
|
|
{
|
|
|
|
f_err:
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,al);
|
|
|
|
}
|
|
|
|
err:
|
1999-02-15 21:05:21 +00:00
|
|
|
EVP_PKEY_free(pkey);
|
|
|
|
X509_free(x);
|
1999-04-12 17:23:57 +00:00
|
|
|
sk_X509_pop_free(sk,X509_free);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_get_key_exchange(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
RSA *rsa=NULL;
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
1998-12-21 10:52:47 +00:00
|
|
|
DH *dh=NULL;
|
1998-12-21 10:56:39 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2001-08-07 09:30:18 +00:00
|
|
|
/* use same message size as in ssl3_get_certificate_request()
|
|
|
|
* as ServerKeyExchange message may be skipped */
|
1998-12-21 10:52:47 +00:00
|
|
|
n=ssl3_get_message(s,
|
|
|
|
SSL3_ST_CR_KEY_EXCH_A,
|
|
|
|
SSL3_ST_CR_KEY_EXCH_B,
|
|
|
|
-1,
|
2001-09-11 13:08:51 +00:00
|
|
|
s->max_cert_list,
|
1998-12-21 10:52:47 +00:00
|
|
|
&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);
|
|
|
|
}
|
|
|
|
|
2001-10-15 19:49:25 +00:00
|
|
|
param=p=(unsigned char *)s->init_msg;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-09 21:22:45 +00:00
|
|
|
if (s->session->sess_cert != NULL)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1999-05-13 15:09:38 +00:00
|
|
|
if (s->session->sess_cert->peer_rsa_tmp != NULL)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-05-13 15:09:38 +00:00
|
|
|
RSA_free(s->session->sess_cert->peer_rsa_tmp);
|
|
|
|
s->session->sess_cert->peer_rsa_tmp=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
1999-05-13 15:09:38 +00:00
|
|
|
if (s->session->sess_cert->peer_dh_tmp)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-05-13 15:09:38 +00:00
|
|
|
DH_free(s->session->sess_cert->peer_dh_tmp);
|
|
|
|
s->session->sess_cert->peer_dh_tmp=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-05-13 15:09:38 +00:00
|
|
|
s->session->sess_cert=ssl_sess_cert_new();
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
param_len=0;
|
|
|
|
alg=s->s3->tmp.new_cipher->algorithms;
|
2001-07-30 23:57:25 +00:00
|
|
|
EVP_MD_CTX_init(&md_ctx);
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
1999-05-13 15:09:38 +00:00
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
|
1998-12-21 10:52:47 +00:00
|
|
|
else
|
|
|
|
{
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto err;
|
|
|
|
}
|
1999-05-13 15:09:38 +00:00
|
|
|
s->session->sess_cert->peer_rsa_tmp=rsa;
|
1999-07-12 15:20:08 +00:00
|
|
|
rsa=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2001-02-20 08:13:47 +00:00
|
|
|
#else /* OPENSSL_NO_RSA */
|
2000-07-02 19:40:44 +00:00
|
|
|
if (0)
|
|
|
|
;
|
1998-12-21 10:52:47 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
2000-07-02 19:40:44 +00:00
|
|
|
else if (alg & SSL_kEDH)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
|
|
|
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
if (alg & SSL_aRSA)
|
1999-05-13 15:09:38 +00:00
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
|
2000-07-02 19:40:44 +00:00
|
|
|
#else
|
|
|
|
if (0)
|
|
|
|
;
|
1998-12-21 10:52:47 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
2000-07-02 19:40:44 +00:00
|
|
|
else if (alg & SSL_aDSS)
|
1999-05-13 15:09:38 +00:00
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
|
1998-12-21 10:52:47 +00:00
|
|
|
#endif
|
|
|
|
/* else anonymous DH, so no certificate or pkey. */
|
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
s->session->sess_cert->peer_dh_tmp=dh;
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
dh=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
else if ((alg & SSL_kDHr) || (alg & SSL_kDHd))
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
|
|
|
|
goto f_err;
|
|
|
|
}
|
2001-02-20 08:13:47 +00:00
|
|
|
#endif /* !OPENSSL_NO_DH */
|
1998-12-21 11:00:56 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* 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 */
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_LENGTH);
|
1998-12-21 11:00:56 +00:00
|
|
|
goto f_err;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
if (pkey->type == EVP_PKEY_RSA)
|
|
|
|
{
|
|
|
|
int num;
|
|
|
|
|
|
|
|
j=0;
|
|
|
|
q=md_buf;
|
|
|
|
for (num=2; num > 0; num--)
|
|
|
|
{
|
2001-10-16 01:24:29 +00:00
|
|
|
EVP_DigestInit_ex(&md_ctx,(num == 2)
|
|
|
|
?s->ctx->md5:s->ctx->sha1, NULL);
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
2001-10-16 01:24:29 +00:00
|
|
|
EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i);
|
1998-12-21 10:52:47 +00:00
|
|
|
q+=i;
|
|
|
|
j+=i;
|
|
|
|
}
|
1999-09-18 22:37:44 +00:00
|
|
|
i=RSA_verify(NID_md5_sha1, md_buf, j, p, n,
|
|
|
|
pkey->pkey.rsa);
|
|
|
|
if (i < 0)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECRYPT_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
|
|
|
|
goto f_err;
|
|
|
|
}
|
1999-09-18 22:37:44 +00:00
|
|
|
if (i == 0)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
/* bad signature */
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECRYPT_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
1998-12-21 10:52:47 +00:00
|
|
|
if (pkey->type == EVP_PKEY_DSA)
|
|
|
|
{
|
|
|
|
/* lets do DSS */
|
2001-10-16 01:24:29 +00:00
|
|
|
EVP_VerifyInit_ex(&md_ctx,EVP_dss1(), NULL);
|
1998-12-21 10:52:47 +00:00
|
|
|
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 */
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECRYPT_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* still data left over */
|
|
|
|
if (!(alg & SSL_aNULL))
|
|
|
|
{
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (n != 0)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
al=SSL_AD_DECODE_ERROR;
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_EXTRA_DATA_IN_MESSAGE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
1999-02-15 21:05:21 +00:00
|
|
|
EVP_PKEY_free(pkey);
|
2001-07-30 23:57:25 +00:00
|
|
|
EVP_MD_CTX_cleanup(&md_ctx);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(1);
|
|
|
|
f_err:
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,al);
|
|
|
|
err:
|
1999-02-15 21:05:21 +00:00
|
|
|
EVP_PKEY_free(pkey);
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1999-07-12 15:20:08 +00:00
|
|
|
if (rsa != NULL)
|
|
|
|
RSA_free(rsa);
|
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
1999-07-12 15:20:08 +00:00
|
|
|
if (dh != NULL)
|
|
|
|
DH_free(dh);
|
|
|
|
#endif
|
2001-07-30 23:57:25 +00:00
|
|
|
EVP_MD_CTX_cleanup(&md_ctx);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_get_certificate_request(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int ok,ret=0;
|
1998-12-21 10:56:39 +00:00
|
|
|
unsigned long n,nc,l;
|
|
|
|
unsigned int llen,ctype_num,i;
|
1998-12-21 10:52:47 +00:00
|
|
|
X509_NAME *xn=NULL;
|
|
|
|
unsigned char *p,*d,*q;
|
1999-04-12 17:23:57 +00:00
|
|
|
STACK_OF(X509_NAME) *ca_sk=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
n=ssl3_get_message(s,
|
|
|
|
SSL3_ST_CR_CERT_REQ_A,
|
|
|
|
SSL3_ST_CR_CERT_REQ_B,
|
|
|
|
-1,
|
2001-09-11 13:08:51 +00:00
|
|
|
s->max_cert_list,
|
1998-12-21 10:52:47 +00:00
|
|
|
&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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_WRONG_MESSAGE_TYPE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-10-15 19:49:25 +00:00
|
|
|
d=p=(unsigned char *)s->init_msg;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-04-12 17:23:57 +00:00
|
|
|
if ((ca_sk=sk_X509_NAME_new(ca_dn_cmp)) == NULL)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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);
|
1998-12-21 11:00:56 +00:00
|
|
|
#if 0
|
|
|
|
{
|
|
|
|
FILE *out;
|
|
|
|
out=fopen("/tmp/vsign.der","w");
|
|
|
|
fwrite(p,1,llen,out);
|
|
|
|
fclose(out);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
if ((llen+ctype_num+2+1) != n)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
|
1998-12-21 10:52:47 +00:00
|
|
|
goto cont; /* netscape bugs */
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
2000-02-03 23:23:24 +00:00
|
|
|
/* If netscape tolerance is on, ignore errors */
|
1998-12-21 10:56:39 +00:00
|
|
|
if (s->options & SSL_OP_NETSCAPE_CA_DN_BUG)
|
1998-12-21 10:52:47 +00:00
|
|
|
goto cont;
|
|
|
|
else
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_ASN1_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (q != (p+l))
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_LENGTH_MISMATCH);
|
|
|
|
goto err;
|
|
|
|
}
|
1999-04-12 17:23:57 +00:00
|
|
|
if (!sk_X509_NAME_push(ca_sk,xn))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
p+=l;
|
|
|
|
nc+=l+2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (0)
|
|
|
|
{
|
|
|
|
cont:
|
|
|
|
ERR_clear_error();
|
|
|
|
}
|
|
|
|
|
2000-02-03 23:23:24 +00:00
|
|
|
/* we should setup a certificate to return.... */
|
1998-12-21 10:52:47 +00:00
|
|
|
s->s3->tmp.cert_req=1;
|
|
|
|
s->s3->tmp.ctype_num=ctype_num;
|
|
|
|
if (s->s3->tmp.ca_names != NULL)
|
1999-04-12 17:23:57 +00:00
|
|
|
sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
|
1998-12-21 10:52:47 +00:00
|
|
|
s->s3->tmp.ca_names=ca_sk;
|
|
|
|
ca_sk=NULL;
|
|
|
|
|
|
|
|
ret=1;
|
|
|
|
err:
|
1999-04-12 17:23:57 +00:00
|
|
|
if (ca_sk != NULL) sk_X509_NAME_pop_free(ca_sk,X509_NAME_free);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
2000-06-01 02:36:58 +00:00
|
|
|
static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
return(X509_NAME_cmp(*a,*b));
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_get_server_done(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int ok,ret=0;
|
|
|
|
long n;
|
|
|
|
|
|
|
|
n=ssl3_get_message(s,
|
|
|
|
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 */
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
|
2002-01-14 12:37:59 +00:00
|
|
|
return -1;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
ret=1;
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_send_client_key_exchange(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-04-27 03:19:12 +00:00
|
|
|
unsigned char *p,*d;
|
1998-12-21 10:52:47 +00:00
|
|
|
int n;
|
|
|
|
unsigned long l;
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1999-04-27 03:19:12 +00:00
|
|
|
unsigned char *q;
|
1998-12-21 10:52:47 +00:00
|
|
|
EVP_PKEY *pkey=NULL;
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_KRB5
|
2000-11-30 22:53:34 +00:00
|
|
|
KSSL_ERR kssl_err;
|
2001-02-20 08:13:47 +00:00
|
|
|
#endif /* OPENSSL_NO_KRB5 */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
|
2000-11-30 22:53:34 +00:00
|
|
|
/* Fool emacs indentation */
|
|
|
|
if (0) {}
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2000-11-30 22:53:34 +00:00
|
|
|
else if (l & SSL_kRSA)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
RSA *rsa;
|
1998-12-21 11:00:56 +00:00
|
|
|
unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
if (s->session->sess_cert->peer_rsa_tmp != NULL)
|
|
|
|
rsa=s->session->sess_cert->peer_rsa_tmp;
|
1998-12-21 10:52:47 +00:00
|
|
|
else
|
|
|
|
{
|
1999-05-13 15:09:38 +00:00
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
|
1998-12-21 10:52:47 +00:00
|
|
|
if ((pkey == NULL) ||
|
|
|
|
(pkey->type != EVP_PKEY_RSA) ||
|
|
|
|
(pkey->pkey.rsa == NULL))
|
|
|
|
{
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
rsa=pkey->pkey.rsa;
|
1999-07-12 17:15:42 +00:00
|
|
|
EVP_PKEY_free(pkey);
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
1999-02-16 09:22:21 +00:00
|
|
|
tmp_buf[0]=s->client_version>>8;
|
|
|
|
tmp_buf[1]=s->client_version&0xff;
|
2002-11-12 13:23:40 +00:00
|
|
|
if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
|
2000-01-21 01:15:56 +00:00
|
|
|
goto err;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2002-11-12 13:23:40 +00:00
|
|
|
s->session->master_key_length=sizeof tmp_buf;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
q=p;
|
|
|
|
/* Fix buf for TLS and beyond */
|
|
|
|
if (s->version > SSL3_VERSION)
|
|
|
|
p+=2;
|
2002-11-12 13:23:40 +00:00
|
|
|
n=RSA_public_encrypt(sizeof tmp_buf,
|
1998-12-21 10:56:39 +00:00
|
|
|
tmp_buf,p,rsa,RSA_PKCS1_PADDING);
|
1998-12-21 11:00:56 +00:00
|
|
|
#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
|
1998-12-21 10:52:47 +00:00
|
|
|
if (n <= 0)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_ENCRYPT);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
/* Fix buf for TLS and beyond */
|
|
|
|
if (s->version > SSL3_VERSION)
|
|
|
|
{
|
|
|
|
s2n(n,q);
|
|
|
|
n+=2;
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
s->session->master_key_length=
|
1998-12-21 10:56:39 +00:00
|
|
|
s->method->ssl3_enc->generate_master_secret(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
s->session->master_key,
|
2002-11-12 13:23:40 +00:00
|
|
|
tmp_buf,sizeof tmp_buf);
|
2002-11-28 08:09:03 +00:00
|
|
|
OPENSSL_cleanse(tmp_buf,sizeof tmp_buf);
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2000-11-30 22:53:34 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_KRB5
|
2000-11-30 22:53:34 +00:00
|
|
|
else if (l & SSL_kKRB5)
|
|
|
|
{
|
|
|
|
krb5_error_code krb5rc;
|
|
|
|
KSSL_CTX *kssl_ctx = s->kssl_ctx;
|
2001-07-09 21:46:58 +00:00
|
|
|
/* krb5_data krb5_ap_req; */
|
|
|
|
krb5_data *enc_ticket;
|
|
|
|
krb5_data authenticator, *authp = NULL;
|
|
|
|
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);
|
2000-11-30 22:53:34 +00:00
|
|
|
|
2002-03-14 18:16:49 +00:00
|
|
|
EVP_CIPHER_CTX_init(&ciph_ctx);
|
|
|
|
|
2000-11-30 22:53:34 +00:00
|
|
|
#ifdef KSSL_DEBUG
|
|
|
|
printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
|
|
|
|
l, SSL_kKRB5);
|
|
|
|
#endif /* KSSL_DEBUG */
|
|
|
|
|
2001-07-09 21:46:58 +00:00
|
|
|
authp = NULL;
|
|
|
|
#ifdef KRB5SENDAUTH
|
|
|
|
if (KRB5SENDAUTH) authp = &authenticator;
|
|
|
|
#endif /* KRB5SENDAUTH */
|
|
|
|
|
|
|
|
krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
|
|
|
|
&kssl_err);
|
|
|
|
enc = kssl_map_enc(kssl_ctx->enctype);
|
2001-07-31 07:21:06 +00:00
|
|
|
if (enc == NULL)
|
|
|
|
goto err;
|
2000-11-30 22:53:34 +00:00
|
|
|
#ifdef KSSL_DEBUG
|
|
|
|
{
|
|
|
|
printf("kssl_cget_tkt rtn %d\n", krb5rc);
|
|
|
|
if (krb5rc && kssl_err.text)
|
2001-07-09 21:46:58 +00:00
|
|
|
printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
|
2000-11-30 22:53:34 +00:00
|
|
|
}
|
|
|
|
#endif /* KSSL_DEBUG */
|
|
|
|
|
|
|
|
if (krb5rc)
|
|
|
|
{
|
2001-07-09 21:46:58 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,
|
|
|
|
SSL_AD_HANDSHAKE_FAILURE);
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
kssl_err.reason);
|
2000-11-30 22:53:34 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2001-07-09 21:46:58 +00:00
|
|
|
/* 20010406 VRS - Earlier versions used KRB5 AP_REQ
|
|
|
|
** in place of RFC 2712 KerberosWrapper, as in:
|
|
|
|
**
|
|
|
|
** 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);
|
2000-11-30 22:53:34 +00:00
|
|
|
**
|
2001-07-09 21:46:58 +00:00
|
|
|
** 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;
|
|
|
|
}
|
|
|
|
|
2002-11-12 13:23:40 +00:00
|
|
|
if (RAND_bytes(tmp_buf,sizeof tmp_buf) <= 0)
|
2001-07-09 21:46:58 +00:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* 20010420 VRS. Tried it this way; failed.
|
2001-10-17 00:37:12 +00:00
|
|
|
** EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,NULL);
|
2001-07-09 21:46:58 +00:00
|
|
|
** EVP_CIPHER_CTX_set_key_length(&ciph_ctx,
|
|
|
|
** kssl_ctx->length);
|
2001-10-17 00:37:12 +00:00
|
|
|
** EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
|
2001-07-09 21:46:58 +00:00
|
|
|
*/
|
|
|
|
|
2002-11-12 13:23:40 +00:00
|
|
|
memset(iv, 0, sizeof iv); /* per RFC 1510 */
|
2001-10-17 16:03:42 +00:00
|
|
|
EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,
|
|
|
|
kssl_ctx->key,iv);
|
2001-07-09 21:46:58 +00:00
|
|
|
EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
|
2002-11-12 13:23:40 +00:00
|
|
|
sizeof tmp_buf);
|
2001-10-17 00:37:12 +00:00
|
|
|
EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
|
2001-07-09 21:46:58 +00:00
|
|
|
outl += padl;
|
2002-08-02 11:47:24 +00:00
|
|
|
if (outl > sizeof epms)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
2001-07-09 21:46:58 +00:00
|
|
|
EVP_CIPHER_CTX_cleanup(&ciph_ctx);
|
|
|
|
|
|
|
|
/* KerberosWrapper.EncryptedPreMasterSecret */
|
|
|
|
s2n(outl,p);
|
|
|
|
memcpy(p, epms, outl);
|
|
|
|
p+=outl;
|
|
|
|
n+=outl + 2;
|
|
|
|
|
2000-11-30 22:53:34 +00:00
|
|
|
s->session->master_key_length=
|
|
|
|
s->method->ssl3_enc->generate_master_secret(s,
|
2001-07-09 21:46:58 +00:00
|
|
|
s->session->master_key,
|
2002-11-12 13:23:40 +00:00
|
|
|
tmp_buf, sizeof tmp_buf);
|
2001-07-09 21:46:58 +00:00
|
|
|
|
2002-11-28 08:09:03 +00:00
|
|
|
OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
|
|
|
|
OPENSSL_cleanse(epms, outl);
|
2000-11-30 22:53:34 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
2000-11-30 22:53:34 +00:00
|
|
|
else if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
DH *dh_srvr,*dh_clnt;
|
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
if (s->session->sess_cert->peer_dh_tmp != NULL)
|
|
|
|
dh_srvr=s->session->sess_cert->peer_dh_tmp;
|
1998-12-21 10:52:47 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* we get them from the cert */
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
|
1998-12-21 10:52:47 +00:00
|
|
|
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 */
|
1998-12-21 10:56:39 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
n=DH_compute_key(p,dh_srvr->pub_key,dh_clnt);
|
1998-12-21 10:56:39 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
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=
|
1998-12-21 10:56:39 +00:00
|
|
|
s->method->ssl3_enc->generate_master_secret(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
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
|
2000-11-30 22:53:34 +00:00
|
|
|
else
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
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:
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_send_client_verify(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
unsigned char *p,*d;
|
|
|
|
unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
|
|
|
|
EVP_PKEY *pkey;
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1999-09-24 19:10:57 +00:00
|
|
|
unsigned u=0;
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
unsigned long n;
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
1998-12-21 10:56:39 +00:00
|
|
|
int j;
|
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
if (s->state == SSL3_ST_CW_CERT_VRFY_A)
|
|
|
|
{
|
|
|
|
d=(unsigned char *)s->init_buf->data;
|
|
|
|
p= &(d[4]);
|
|
|
|
pkey=s->cert->key->privatekey;
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
s->method->ssl3_enc->cert_verify_mac(s,&(s->s3->finish_dgst2),
|
|
|
|
&(data[MD5_DIGEST_LENGTH]));
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
if (pkey->type == EVP_PKEY_RSA)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
s->method->ssl3_enc->cert_verify_mac(s,
|
|
|
|
&(s->s3->finish_dgst1),&(data[0]));
|
1999-09-18 22:37:44 +00:00
|
|
|
if (RSA_sign(NID_md5_sha1, data,
|
|
|
|
MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
|
1999-09-24 19:10:57 +00:00
|
|
|
&(p[2]), &u, pkey->pkey.rsa) <= 0 )
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
1999-09-24 19:10:57 +00:00
|
|
|
s2n(u,p);
|
|
|
|
n=u+2;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
1998-12-21 10:52:47 +00:00
|
|
|
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
|
|
|
|
#endif
|
|
|
|
{
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_INTERNAL_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
*(d++)=SSL3_MT_CERTIFICATE_VERIFY;
|
|
|
|
l2n3(n,d);
|
|
|
|
|
|
|
|
s->init_num=(int)n+4;
|
|
|
|
s->init_off=0;
|
|
|
|
}
|
|
|
|
return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
|
|
|
|
err:
|
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_send_client_certificate(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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)
|
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
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;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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;
|
1998-12-21 10:56:39 +00:00
|
|
|
l=ssl3_output_cert_chain(s,
|
|
|
|
(s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
|
1998-12-21 10:52:47 +00:00
|
|
|
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))
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
static int ssl3_check_cert_and_algorithm(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int i,idx;
|
|
|
|
long algs;
|
|
|
|
EVP_PKEY *pkey=NULL;
|
1999-05-13 15:09:38 +00:00
|
|
|
SESS_CERT *sc;
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
RSA *rsa;
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
1998-12-21 10:52:47 +00:00
|
|
|
DH *dh;
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
sc=s->session->sess_cert;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
if (sc == NULL)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2001-03-07 01:19:07 +00:00
|
|
|
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
|
1998-12-21 10:52:47 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
algs=s->s3->tmp.new_cipher->algorithms;
|
|
|
|
|
|
|
|
/* we don't have a certificate */
|
2000-11-30 22:53:34 +00:00
|
|
|
if (algs & (SSL_aDH|SSL_aNULL|SSL_aKRB5))
|
1998-12-21 10:52:47 +00:00
|
|
|
return(1);
|
|
|
|
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1999-05-13 15:09:38 +00:00
|
|
|
rsa=s->session->sess_cert->peer_rsa_tmp;
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
1999-05-13 15:09:38 +00:00
|
|
|
dh=s->session->sess_cert->peer_dh_tmp;
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* This is the passed certificate */
|
|
|
|
|
1999-05-13 15:09:38 +00:00
|
|
|
idx=sc->peer_cert_type;
|
|
|
|
pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509);
|
|
|
|
i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey);
|
1999-02-15 21:05:21 +00:00
|
|
|
EVP_PKEY_free(pkey);
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
1998-12-21 10:52:47 +00:00
|
|
|
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
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
|
|
|
}
|
1999-04-27 03:19:12 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
1999-04-27 03:19:12 +00:00
|
|
|
if ((algs & SSL_kEDH) &&
|
1998-12-21 10:52:47 +00:00
|
|
|
!(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;
|
|
|
|
}
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DSA
|
1998-12-21 10:52:47 +00:00
|
|
|
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
|
|
|
|
|
2000-01-22 03:17:06 +00:00
|
|
|
if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i,EVP_PKT_EXP))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
1998-12-21 10:52:47 +00:00
|
|
|
if (algs & SSL_kRSA)
|
|
|
|
{
|
1999-02-21 20:03:24 +00:00
|
|
|
if (rsa == NULL
|
2000-01-22 03:17:06 +00:00
|
|
|
|| RSA_size(rsa) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
1998-12-21 10:52:47 +00:00
|
|
|
if (algs & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
|
1999-02-21 20:03:24 +00:00
|
|
|
{
|
|
|
|
if (dh == NULL
|
2000-01-22 03:17:06 +00:00
|
|
|
|| DH_size(dh) > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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:
|
1998-12-21 10:56:39 +00:00
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
|
1998-12-21 10:52:47 +00:00
|
|
|
err:
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|