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
|
|
|
/* ====================================================================
|
2007-02-17 06:45:38 +00:00
|
|
|
* Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
|
2002-01-14 23:40:26 +00:00
|
|
|
*
|
|
|
|
* 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).
|
|
|
|
*
|
|
|
|
*/
|
2002-08-09 08:56:08 +00:00
|
|
|
/* ====================================================================
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
2006-03-10 23:06:27 +00:00
|
|
|
/* ====================================================================
|
|
|
|
* Copyright 2005 Nokia. All rights reserved.
|
|
|
|
*
|
|
|
|
* The portions of the attached software ("Contribution") is developed by
|
|
|
|
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
|
|
|
|
* license.
|
|
|
|
*
|
|
|
|
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
|
|
|
|
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
|
|
|
|
* support (see RFC 4279) to OpenSSL.
|
|
|
|
*
|
|
|
|
* No patent licenses or other rights except those expressly stated in
|
|
|
|
* the OpenSSL open source license shall be deemed granted or received
|
|
|
|
* expressly, by implication, estoppel, or otherwise.
|
|
|
|
*
|
|
|
|
* No assurances are provided by Nokia that the Contribution does not
|
|
|
|
* infringe the patent or other intellectual property rights of any third
|
|
|
|
* party or that the license provides you with all the necessary rights
|
|
|
|
* to make use of the Contribution.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
|
|
|
|
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
|
|
|
|
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
|
|
|
|
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
|
|
|
|
* OTHERWISE.
|
|
|
|
*/
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
2011-02-16 17:25:01 +00:00
|
|
|
#include <openssl/crypto.h>
|
2002-07-10 07:01: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>
|
2005-07-16 12:37:36 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
2004-04-19 18:09:28 +00:00
|
|
|
#include <openssl/dh.h>
|
2005-07-16 12:37:36 +00:00
|
|
|
#endif
|
2004-05-17 18:53:47 +00:00
|
|
|
#include <openssl/bn.h>
|
2008-06-01 22:33:24 +00:00
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
#include <openssl/engine.h>
|
|
|
|
#endif
|
2000-11-30 22:53:34 +00:00
|
|
|
|
2005-08-14 21:48:33 +00:00
|
|
|
static const SSL_METHOD *ssl3_get_client_method(int ver);
|
2000-06-01 02:36:58 +00:00
|
|
|
static int ca_dn_cmp(const X509_NAME * const *a,const X509_NAME * const *b);
|
2002-08-09 08:56:08 +00:00
|
|
|
|
2005-08-14 21:48:33 +00:00
|
|
|
static const 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);
|
|
|
|
}
|
|
|
|
|
2005-08-05 23:56:11 +00:00
|
|
|
IMPLEMENT_ssl3_meth_func(SSLv3_client_method,
|
|
|
|
ssl_undefined_function,
|
|
|
|
ssl3_connect,
|
|
|
|
ssl3_get_client_method)
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int ssl3_connect(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2002-12-21 23:49:21 +00:00
|
|
|
BUF_MEM *buf=NULL;
|
2007-02-17 06:45:38 +00:00
|
|
|
unsigned long Time=(unsigned long)time(NULL);
|
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;
|
2009-02-14 21:49:38 +00:00
|
|
|
int new_state,state,skip=0;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
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:
|
2010-08-26 14:23:52 +00:00
|
|
|
s->renegotiate=1;
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
2002-12-21 23:49:21 +00:00
|
|
|
buf=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
2011-03-12 17:01:19 +00:00
|
|
|
#ifndef OPENSSL_NO_SRP
|
|
|
|
if ((ret == 0) && (s->s3->warn_alert == SSL_AD_MISSING_SRP_USERNAME))
|
|
|
|
{
|
|
|
|
if (!SRP_have_to_put_srp_username(s))
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_MISSING_SRP_USERNAME);
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_USER_CANCELLED);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
s->state=SSL3_ST_CW_CLNT_HELLO_A;
|
|
|
|
if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
if (ret <= 0) goto end;
|
2006-01-11 06:10:40 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
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:
|
2007-08-11 23:18:29 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
ret=ssl3_check_finished(s);
|
|
|
|
if (ret <= 0) goto end;
|
|
|
|
if (ret == 2)
|
|
|
|
{
|
|
|
|
s->hit = 1;
|
2007-11-03 13:09:34 +00:00
|
|
|
if (s->tlsext_ticket_expected)
|
|
|
|
s->state=SSL3_ST_CR_SESSION_TICKET_A;
|
|
|
|
else
|
|
|
|
s->state=SSL3_ST_CR_FINISHED_A;
|
2007-08-11 23:18:29 +00:00
|
|
|
s->init_num=0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2002-08-09 08:56:08 +00:00
|
|
|
/* Check if it is anon DH/ECDH */
|
2006-03-10 23:06:27 +00:00
|
|
|
/* or PSK */
|
2007-02-17 06:45:38 +00:00
|
|
|
if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
|
|
|
|
!(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
ret=ssl3_get_server_certificate(s);
|
|
|
|
if (ret <= 0) goto end;
|
2007-09-26 21:56:59 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
if (s->tlsext_status_expected)
|
|
|
|
s->state=SSL3_ST_CR_CERT_STATUS_A;
|
|
|
|
else
|
|
|
|
s->state=SSL3_ST_CR_KEY_EXCH_A;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
skip = 1;
|
|
|
|
s->state=SSL3_ST_CR_KEY_EXCH_A;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2007-09-26 21:56:59 +00:00
|
|
|
#else
|
2007-10-14 14:09:13 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
else
|
|
|
|
skip=1;
|
2007-09-26 21:56:59 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
s->state=SSL3_ST_CR_KEY_EXCH_A;
|
2007-09-26 21:56:59 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
2011-03-12 17:01:19 +00:00
|
|
|
#ifndef OPENSSL_NO_SRP
|
|
|
|
if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP)
|
|
|
|
{
|
|
|
|
if ((ret = SRP_Calc_A_param(s))<=0)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_SRP_A_CALC);
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INTERNAL_ERROR);
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
|
|
|
/* 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 */
|
2002-08-09 08:56:08 +00:00
|
|
|
/* 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.
|
|
|
|
*/
|
1998-12-21 10:56:39 +00:00
|
|
|
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;
|
|
|
|
}
|
2009-06-16 16:38:47 +00:00
|
|
|
if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY)
|
|
|
|
{
|
|
|
|
s->state=SSL3_ST_CW_CHANGE_A;
|
|
|
|
s->s3->change_cipher_spec=0;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
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;
|
2010-07-28 10:06:55 +00:00
|
|
|
|
2010-09-05 17:14:01 +00:00
|
|
|
#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
|
1998-12-21 10:52:47 +00:00
|
|
|
s->state=SSL3_ST_CW_FINISHED_A;
|
2010-07-28 10:06:55 +00:00
|
|
|
#else
|
|
|
|
if (s->next_proto_negotiated)
|
|
|
|
s->state=SSL3_ST_CW_NEXT_PROTO_A;
|
|
|
|
else
|
|
|
|
s->state=SSL3_ST_CW_FINISHED_A;
|
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
s->init_num=0;
|
|
|
|
|
|
|
|
s->session->cipher=s->s3->tmp.new_cipher;
|
2005-09-30 23:35:33 +00:00
|
|
|
#ifdef OPENSSL_NO_COMP
|
|
|
|
s->session->compress_meth=0;
|
|
|
|
#else
|
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;
|
2005-09-30 23:35:33 +00:00
|
|
|
#endif
|
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;
|
|
|
|
|
2010-09-05 17:14:01 +00:00
|
|
|
#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
|
2010-07-28 10:06:55 +00:00
|
|
|
case SSL3_ST_CW_NEXT_PROTO_A:
|
|
|
|
case SSL3_ST_CW_NEXT_PROTO_B:
|
|
|
|
ret=ssl3_send_next_proto(s);
|
|
|
|
if (ret <= 0) goto end;
|
|
|
|
s->state=SSL3_ST_CW_FINISHED_A;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
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
|
|
|
|
{
|
2007-08-11 23:18:29 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
/* Allow NewSessionTicket if ticket expected */
|
|
|
|
if (s->tlsext_ticket_expected)
|
|
|
|
s->s3->tmp.next_state=SSL3_ST_CR_SESSION_TICKET_A;
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
|
|
|
|
}
|
|
|
|
s->init_num=0;
|
|
|
|
break;
|
|
|
|
|
2007-08-11 23:18:29 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
case SSL3_ST_CR_SESSION_TICKET_A:
|
|
|
|
case SSL3_ST_CR_SESSION_TICKET_B:
|
|
|
|
ret=ssl3_get_new_session_ticket(s);
|
2007-08-31 00:28:01 +00:00
|
|
|
if (ret <= 0) goto end;
|
2007-08-11 23:18:29 +00:00
|
|
|
s->state=SSL3_ST_CR_FINISHED_A;
|
|
|
|
s->init_num=0;
|
|
|
|
break;
|
2007-09-26 21:56:59 +00:00
|
|
|
|
|
|
|
case SSL3_ST_CR_CERT_STATUS_A:
|
|
|
|
case SSL3_ST_CR_CERT_STATUS_B:
|
|
|
|
ret=ssl3_get_cert_status(s);
|
|
|
|
if (ret <= 0) goto end;
|
|
|
|
s->state=SSL3_ST_CR_KEY_EXCH_A;
|
|
|
|
s->init_num=0;
|
|
|
|
break;
|
2007-08-11 23:18:29 +00:00
|
|
|
#endif
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
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:
|
2010-01-26 19:47:37 +00:00
|
|
|
s->rwstate=SSL_WRITING;
|
|
|
|
if (BIO_flush(s->wbio) <= 0)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2010-01-26 19:47:37 +00:00
|
|
|
ret= -1;
|
|
|
|
goto end;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
2010-01-26 19:47:37 +00:00
|
|
|
s->rwstate=SSL_NOTHING;
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
2010-08-26 14:23:52 +00:00
|
|
|
s->renegotiate=0;
|
1998-12-21 10:52:47 +00:00
|
|
|
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--;
|
2002-12-21 23:49:21 +00:00
|
|
|
if (buf != NULL)
|
|
|
|
BUF_MEM_free(buf);
|
1998-12-21 10:52:47 +00:00
|
|
|
if (cb != NULL)
|
|
|
|
cb(s,SSL_CB_CONNECT_EXIT,ret);
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
int ssl3_client_hello(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
unsigned char *buf;
|
|
|
|
unsigned char *p,*d;
|
2005-09-30 23:35:33 +00:00
|
|
|
int i;
|
1998-12-21 10:52:47 +00:00
|
|
|
unsigned long Time,l;
|
2005-09-30 23:35:33 +00:00
|
|
|
#ifndef OPENSSL_NO_COMP
|
|
|
|
int j;
|
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;
|
2005-09-30 23:35:33 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
buf=(unsigned char *)s->init_buf->data;
|
|
|
|
if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
|
|
|
|
{
|
2009-10-28 19:52:18 +00:00
|
|
|
SSL_SESSION *sess = s->session;
|
|
|
|
if ((sess == NULL) ||
|
|
|
|
(sess->ssl_version != s->version) ||
|
|
|
|
#ifdef OPENSSL_NO_TLSEXT
|
|
|
|
!sess->session_id_length ||
|
|
|
|
#else
|
|
|
|
(!sess->session_id_length && !sess->tlsext_tick) ||
|
|
|
|
#endif
|
|
|
|
(sess->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;
|
2005-12-05 17:21:22 +00:00
|
|
|
Time=(unsigned long)time(NULL); /* Time */
|
1998-12-21 10:52:47 +00:00
|
|
|
l2n(Time,p);
|
2005-04-29 20:10:06 +00:00
|
|
|
if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
|
|
|
|
goto err;
|
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)
|
|
|
|
{
|
2003-10-29 20:24:15 +00:00
|
|
|
if (i > (int)sizeof(s->session->session_id))
|
2002-08-02 11:48:15 +00:00
|
|
|
{
|
|
|
|
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 */
|
2005-05-11 18:25:49 +00:00
|
|
|
i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),0);
|
1998-12-21 10:52:47 +00:00
|
|
|
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 */
|
2005-09-30 23:35:33 +00:00
|
|
|
#ifdef OPENSSL_NO_COMP
|
|
|
|
*(p++)=1;
|
|
|
|
#else
|
2005-10-08 00:18:53 +00:00
|
|
|
|
|
|
|
if ((s->options & SSL_OP_NO_COMPRESSION)
|
|
|
|
|| !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
|
|
|
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;
|
|
|
|
}
|
2005-09-30 23:35:33 +00:00
|
|
|
#endif
|
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++)=0; /* Add the NULL method */
|
2007-09-21 06:54:24 +00:00
|
|
|
|
2006-01-02 23:14:37 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
2007-09-21 06:54:24 +00:00
|
|
|
/* TLS extensions*/
|
2006-03-11 23:46:37 +00:00
|
|
|
if (ssl_prepare_clienthello_tlsext(s) <= 0)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
|
|
|
|
goto err;
|
|
|
|
}
|
2006-01-03 03:27:19 +00:00
|
|
|
if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
|
|
|
|
{
|
2006-01-02 23:14:37 +00:00
|
|
|
SSLerr(SSL_F_SSL3_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
2006-01-03 03:27:19 +00:00
|
|
|
}
|
2006-01-02 23:14:37 +00:00
|
|
|
#endif
|
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);
|
|
|
|
}
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
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;
|
2008-10-12 14:32:47 +00:00
|
|
|
const SSL_CIPHER *c;
|
1998-12-21 10:52:47 +00:00
|
|
|
unsigned char *p,*d;
|
|
|
|
int i,al,ok;
|
|
|
|
unsigned int j;
|
|
|
|
long n;
|
2005-09-30 23:35:33 +00:00
|
|
|
#ifndef OPENSSL_NO_COMP
|
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;
|
2005-09-30 23:35:33 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
n=s->method->ssl_get_message(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
SSL3_ST_CR_SRVR_HELLO_A,
|
|
|
|
SSL3_ST_CR_SRVR_HELLO_B,
|
2005-04-26 16:02:40 +00:00
|
|
|
-1,
|
2007-08-11 23:18:29 +00:00
|
|
|
20000, /* ?? */
|
1998-12-21 10:52:47 +00:00
|
|
|
&ok);
|
|
|
|
|
|
|
|
if (!ok) return((int)n);
|
2005-04-26 16:02:40 +00:00
|
|
|
|
2009-04-20 11:33:12 +00:00
|
|
|
if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
|
2005-04-26 16:02:40 +00:00
|
|
|
{
|
|
|
|
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;
|
2005-04-26 18:53:22 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
|
2005-04-26 16:02:40 +00:00
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO)
|
|
|
|
{
|
|
|
|
al=SSL_AD_UNEXPECTED_MESSAGE;
|
2005-04-26 18:53:22 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
|
2005-04-26 16:02:40 +00:00
|
|
|
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
|
|
|
|
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-19 11:44:07 +00:00
|
|
|
if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2002-09-19 11:44:07 +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-13 15:43:43 +00:00
|
|
|
|
2008-11-15 17:18:12 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
/* check if we want to resume the session based on external pre-shared secret */
|
|
|
|
if (s->version >= TLS1_VERSION && s->tls_session_secret_cb)
|
|
|
|
{
|
|
|
|
SSL_CIPHER *pref_cipher=NULL;
|
|
|
|
s->session->master_key_length=sizeof(s->session->master_key);
|
|
|
|
if (s->tls_session_secret_cb(s, s->session->master_key,
|
|
|
|
&s->session->master_key_length,
|
|
|
|
NULL, &pref_cipher,
|
|
|
|
s->tls_session_secret_cb_arg))
|
|
|
|
{
|
|
|
|
s->session->cipher = pref_cipher ?
|
|
|
|
pref_cipher : ssl_get_cipher_by_char(s, p+j);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* OPENSSL_NO_TLSEXT */
|
|
|
|
|
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-19 11:44:07 +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:48:58 +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:53:33 +00:00
|
|
|
if (s->hit && (s->session->cipher_id != c->id))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2011-02-03 10:43:00 +00:00
|
|
|
/* Workaround is now obsolete */
|
|
|
|
#if 0
|
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))
|
2011-02-03 10:43:00 +00:00
|
|
|
#endif
|
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_OLD_SESSION_CIPHER_NOT_RETURNED);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s->s3->tmp.new_cipher=c;
|
2008-12-27 02:00:38 +00:00
|
|
|
if (!ssl3_digest_cached_records(s))
|
|
|
|
goto f_err;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* lets get the compression algorithm */
|
1998-12-21 11:00:56 +00:00
|
|
|
/* COMPRESSION */
|
2005-09-30 23:35:33 +00:00
|
|
|
#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;
|
|
|
|
}
|
2010-01-01 14:39:37 +00:00
|
|
|
/* If compression is disabled we'd better not try to resume a session
|
|
|
|
* using compression.
|
|
|
|
*/
|
|
|
|
if (s->session->compress_meth != 0)
|
|
|
|
{
|
|
|
|
al=SSL_AD_INTERNAL_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_INCONSISTENT_COMPRESSION);
|
|
|
|
goto f_err;
|
|
|
|
}
|
2005-09-30 23:35:33 +00:00
|
|
|
#else
|
1998-12-21 10:52:47 +00:00
|
|
|
j= *(p++);
|
2010-01-06 17:35:27 +00:00
|
|
|
if (s->hit && j != s->session->compress_meth)
|
2010-01-01 14:39:37 +00:00
|
|
|
{
|
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (j == 0)
|
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
|
|
|
comp=NULL;
|
2010-01-01 14:39:37 +00:00
|
|
|
else if (s->options & SSL_OP_NO_COMPRESSION)
|
|
|
|
{
|
|
|
|
al=SSL_AD_ILLEGAL_PARAMETER;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_COMPRESSION_DISABLED);
|
|
|
|
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
|
|
|
|
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;
|
|
|
|
}
|
2005-09-30 23:35:33 +00:00
|
|
|
#endif
|
2007-09-21 06:54:24 +00:00
|
|
|
|
2006-01-02 23:14:37 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
/* TLS extensions*/
|
2009-12-08 13:14:03 +00:00
|
|
|
if (s->version >= SSL3_VERSION)
|
2006-01-03 03:27:19 +00:00
|
|
|
{
|
|
|
|
if (!ssl_parse_serverhello_tlsext(s,&p,d,n, &al))
|
|
|
|
{
|
|
|
|
/* 'al' set by ssl_parse_serverhello_tlsext */
|
2006-03-11 23:46:37 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_PARSE_TLSEXT);
|
2006-01-02 23:14:37 +00:00
|
|
|
goto f_err;
|
2006-01-03 03:27:19 +00:00
|
|
|
}
|
2006-03-11 23:46:37 +00:00
|
|
|
if (ssl_check_serverhello_tlsext(s) <= 0)
|
2006-01-13 09:21:10 +00:00
|
|
|
{
|
2007-04-24 01:06:19 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT);
|
2006-01-13 09:21:10 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2006-01-02 23:14:37 +00:00
|
|
|
}
|
|
|
|
#endif
|
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);
|
|
|
|
}
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
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;
|
2004-03-15 23:15:26 +00:00
|
|
|
const unsigned char *q,*p;
|
|
|
|
unsigned char *d;
|
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;
|
2003-02-28 15:07:10 +00:00
|
|
|
int need_cert = 1; /* VRS: 0=> will allow null cert if auth == KRB5 */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
n=s->method->ssl_get_message(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
|
|
|
|
2010-02-27 23:02:41 +00:00
|
|
|
if ((s->s3->tmp.message_type == SSL3_MT_SERVER_KEY_EXCHANGE) ||
|
2010-02-28 00:24:04 +00:00
|
|
|
((s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) &&
|
2010-02-27 23:02:41 +00:00
|
|
|
(s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
2004-03-15 23:15:26 +00:00
|
|
|
p=d=(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);
|
2009-01-07 23:44:27 +00:00
|
|
|
if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)
|
2001-07-12 08:51:47 +00:00
|
|
|
#ifndef OPENSSL_NO_KRB5
|
2007-02-17 06:45:38 +00:00
|
|
|
&& !((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5) &&
|
|
|
|
(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
|
2001-07-12 08:51:47 +00:00
|
|
|
#endif /* OPENSSL_NO_KRB5 */
|
2007-02-17 06:45:38 +00:00
|
|
|
)
|
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);
|
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
/* VRS: allow null cert if auth == KRB5 */
|
2007-02-17 06:45:38 +00:00
|
|
|
need_cert = ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5) &&
|
|
|
|
(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
|
|
|
|
? 0 : 1;
|
2000-11-30 22:53:34 +00:00
|
|
|
|
|
|
|
#ifdef KSSL_DEBUG
|
2008-11-12 03:58:08 +00:00
|
|
|
printf("pkey,x = %p, %p\n", pkey,x);
|
2000-11-30 22:53:34 +00:00
|
|
|
printf("ssl_cert_type(x,pkey) = %d\n", ssl_cert_type(x,pkey));
|
2007-02-17 06:45:38 +00:00
|
|
|
printf("cipher, alg, nc = %s, %lx, %lx, %d\n", s->s3->tmp.new_cipher->name,
|
|
|
|
s->s3->tmp.new_cipher->algorithm_mkey, s->s3->tmp.new_cipher->algorithm_auth, need_cert);
|
2000-11-30 22:53:34 +00:00
|
|
|
#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;
|
|
|
|
}
|
|
|
|
|
2003-02-28 15:07:10 +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);
|
|
|
|
}
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
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;
|
2007-02-17 06:45:38 +00:00
|
|
|
long n,alg_k,alg_a;
|
1998-12-21 10:52:47 +00:00
|
|
|
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
|
2002-08-09 08:56:08 +00:00
|
|
|
#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
|
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 */
|
2005-04-26 16:02:40 +00:00
|
|
|
n=s->method->ssl_get_message(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
2006-03-10 23:06:27 +00:00
|
|
|
#ifndef OPENSSL_NO_PSK
|
|
|
|
/* In plain PSK ciphersuite, ServerKeyExchange can be
|
|
|
|
omitted if no identity hint is sent. Set
|
|
|
|
session->sess_cert anyway to avoid problems
|
|
|
|
later.*/
|
2007-02-17 06:45:38 +00:00
|
|
|
if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)
|
2006-03-10 23:06:27 +00:00
|
|
|
{
|
|
|
|
s->session->sess_cert=ssl_sess_cert_new();
|
|
|
|
if (s->ctx->psk_identity_hint)
|
|
|
|
OPENSSL_free(s->ctx->psk_identity_hint);
|
|
|
|
s->ctx->psk_identity_hint = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
s->s3->tmp.reuse_message=1;
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
2001-10-15 19:49:25 +00:00
|
|
|
param=p=(unsigned char *)s->init_msg;
|
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
|
|
|
}
|
2002-08-09 08:56:08 +00:00
|
|
|
#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;
|
|
|
|
}
|
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;
|
2007-02-17 06:45:38 +00:00
|
|
|
alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
|
|
|
|
alg_a=s->s3->tmp.new_cipher->algorithm_auth;
|
2001-07-30 23:57:25 +00:00
|
|
|
EVP_MD_CTX_init(&md_ctx);
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2006-03-10 23:06:27 +00:00
|
|
|
#ifndef OPENSSL_NO_PSK
|
2007-02-17 06:45:38 +00:00
|
|
|
if (alg_k & SSL_kPSK)
|
|
|
|
{
|
2006-03-10 23:06:27 +00:00
|
|
|
char tmp_id_hint[PSK_MAX_IDENTITY_LEN+1];
|
|
|
|
|
|
|
|
al=SSL_AD_HANDSHAKE_FAILURE;
|
|
|
|
n2s(p,i);
|
|
|
|
param_len=i+2;
|
|
|
|
/* Store PSK identity hint for later use, hint is used
|
|
|
|
* in ssl3_send_client_key_exchange. Assume that the
|
|
|
|
* maximum length of a PSK identity hint can be as
|
|
|
|
* long as the maximum length of a PSK identity. */
|
|
|
|
if (i > PSK_MAX_IDENTITY_LEN)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
|
|
|
|
SSL_R_DATA_LENGTH_TOO_LONG);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (param_len > n)
|
|
|
|
{
|
|
|
|
al=SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
|
|
|
|
SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
/* If received PSK identity hint contains NULL
|
|
|
|
* characters, the hint is truncated from the first
|
|
|
|
* NULL. p may not be ending with NULL, so create a
|
|
|
|
* NULL-terminated string. */
|
|
|
|
memcpy(tmp_id_hint, p, i);
|
|
|
|
memset(tmp_id_hint+i, 0, PSK_MAX_IDENTITY_LEN+1-i);
|
|
|
|
if (s->ctx->psk_identity_hint != NULL)
|
|
|
|
OPENSSL_free(s->ctx->psk_identity_hint);
|
|
|
|
s->ctx->psk_identity_hint = BUF_strdup(tmp_id_hint);
|
|
|
|
if (s->ctx->psk_identity_hint == NULL)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto f_err;
|
2007-02-17 06:45:38 +00:00
|
|
|
}
|
2006-03-10 23:06:27 +00:00
|
|
|
|
|
|
|
p+=i;
|
|
|
|
n-=param_len;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif /* !OPENSSL_NO_PSK */
|
2011-03-12 17:01:19 +00:00
|
|
|
#ifndef OPENSSL_NO_SRP
|
|
|
|
if (alg_k & SSL_kSRP)
|
|
|
|
{
|
|
|
|
n2s(p,i);
|
|
|
|
param_len=i+2;
|
|
|
|
if (param_len > n)
|
|
|
|
{
|
|
|
|
al=SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_N_LENGTH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (!(s->srp_ctx.N=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)
|
|
|
|
{
|
|
|
|
al=SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_G_LENGTH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (!(s->srp_ctx.g=BN_bin2bn(p,i,NULL)))
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
p+=i;
|
|
|
|
|
|
|
|
i = (unsigned int)(p[0]);
|
|
|
|
p++;
|
|
|
|
param_len+=i+1;
|
|
|
|
if (param_len > n)
|
|
|
|
{
|
|
|
|
al=SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_S_LENGTH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (!(s->srp_ctx.s=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)
|
|
|
|
{
|
|
|
|
al=SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_B_LENGTH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (!(s->srp_ctx.B=BN_bin2bn(p,i,NULL)))
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
p+=i;
|
|
|
|
n-=param_len;
|
|
|
|
|
|
|
|
/* We must check if there is a certificate */
|
|
|
|
#ifndef OPENSSL_NO_RSA
|
|
|
|
if (alg_a & SSL_aRSA)
|
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
|
|
|
|
#else
|
|
|
|
if (0)
|
|
|
|
;
|
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_DSA
|
|
|
|
else if (alg_a & SSL_aDSS)
|
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif /* !OPENSSL_NO_SRP */
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2007-02-17 06:45:38 +00:00
|
|
|
if (alg_k & SSL_kRSA)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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 */
|
2007-02-17 06:45:38 +00:00
|
|
|
if (alg_a & 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
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k & 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
|
2007-02-17 06:45:38 +00:00
|
|
|
if (alg_a & 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
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_a & 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
|
|
|
}
|
2007-02-17 06:45:38 +00:00
|
|
|
else if ((alg_k & SSL_kDHr) || (alg_k & SSL_kDHd))
|
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_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
|
|
|
|
goto f_err;
|
|
|
|
}
|
2001-02-20 08:13:47 +00:00
|
|
|
#endif /* !OPENSSL_NO_DH */
|
2002-08-09 08:56:08 +00:00
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_ECDH
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k & SSL_kEECDH)
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
2005-05-16 10:11:04 +00:00
|
|
|
EC_GROUP *ngroup;
|
|
|
|
const EC_GROUP *group;
|
|
|
|
|
2002-08-09 08:56:08 +00:00
|
|
|
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
|
2005-12-13 07:33:35 +00:00
|
|
|
* and the ECParameters in this case is just three bytes.
|
2002-08-09 08:56:08 +00:00
|
|
|
*/
|
2005-12-13 07:33:35 +00:00
|
|
|
param_len=3;
|
2002-08-09 08:56:08 +00:00
|
|
|
if ((param_len > n) ||
|
|
|
|
(*p != NAMED_CURVE_TYPE) ||
|
2006-03-30 02:44:56 +00:00
|
|
|
((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0))
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
al=SSL_AD_INTERNAL_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
|
2005-05-16 10:11:04 +00:00
|
|
|
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)
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
2005-05-16 10:11:04 +00:00
|
|
|
EC_GROUP_free(ngroup);
|
|
|
|
|
|
|
|
group = EC_KEY_get0_group(ecdh);
|
2002-08-09 08:56:08 +00:00
|
|
|
|
|
|
|
if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
|
2005-05-16 10:11:04 +00:00
|
|
|
(EC_GROUP_get_degree(group) > 163))
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
al=SSL_AD_EXPORT_RESTRICTION;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
|
2005-12-13 07:33:35 +00:00
|
|
|
p+=3;
|
2002-08-09 08:56:08 +00:00
|
|
|
|
|
|
|
/* Next, get the encoded ECPoint */
|
2005-05-16 10:11:04 +00:00
|
|
|
if (((srvr_ecpoint = EC_POINT_new(group)) == NULL) ||
|
2002-08-09 08:56:08 +00:00
|
|
|
((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) ||
|
2005-05-16 10:11:04 +00:00
|
|
|
(EC_POINT_oct2point(group, srvr_ecpoint,
|
2002-08-09 08:56:08 +00:00
|
|
|
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
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_a & SSL_aRSA)
|
2002-08-09 08:56:08 +00:00
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
|
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_ECDSA
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_a & SSL_aECDSA)
|
2002-08-09 08:56:08 +00:00
|
|
|
pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
|
|
|
|
#endif
|
|
|
|
/* else anonymous ECDH, so no certificate or pkey. */
|
2005-05-16 10:11:04 +00:00
|
|
|
EC_KEY_set_public_key(ecdh, srvr_ecpoint);
|
2002-08-09 08:56:08 +00:00
|
|
|
s->session->sess_cert->peer_ecdh_tmp=ecdh;
|
|
|
|
ecdh=NULL;
|
|
|
|
BN_CTX_free(bn_ctx);
|
2010-10-10 12:15:47 +00:00
|
|
|
bn_ctx = NULL;
|
2005-05-16 10:11:04 +00:00
|
|
|
EC_POINT_free(srvr_ecpoint);
|
2002-08-09 08:56:08 +00:00
|
|
|
srvr_ecpoint = NULL;
|
|
|
|
}
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k)
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
al=SSL_AD_UNEXPECTED_MESSAGE;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
#endif /* !OPENSSL_NO_ECDH */
|
1998-12-21 11:00:56 +00:00
|
|
|
|
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);
|
2009-01-07 23:44:27 +00:00
|
|
|
if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 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
|
2002-08-09 08:56:08 +00:00
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_ECDSA
|
2002-08-12 08:47:41 +00:00
|
|
|
if (pkey->type == EVP_PKEY_EC)
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
/* 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);
|
2009-01-07 23:44:27 +00:00
|
|
|
if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
/* bad signature */
|
|
|
|
al=SSL_AD_DECRYPT_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
1998-12-21 10:52:47 +00:00
|
|
|
#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
|
|
|
|
{
|
2007-02-17 06:45:38 +00:00
|
|
|
if (!(alg_a & SSL_aNULL) && !(alg_k & SSL_kPSK))
|
2006-03-10 23:06:27 +00:00
|
|
|
/* aNULL or kPSK do not need public keys */
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
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;
|
|
|
|
}
|
2006-03-10 23:06:27 +00:00
|
|
|
/* still data left over */
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
2002-08-09 08:56:08 +00:00
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_ECDH
|
|
|
|
BN_CTX_free(bn_ctx);
|
|
|
|
EC_POINT_free(srvr_ecpoint);
|
|
|
|
if (ecdh != NULL)
|
|
|
|
EC_KEY_free(ecdh);
|
1999-07-12 15:20:08 +00:00
|
|
|
#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);
|
|
|
|
}
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
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;
|
2004-03-15 23:15:26 +00:00
|
|
|
const unsigned char *p,*q;
|
|
|
|
unsigned char *d;
|
1999-04-12 17:23:57 +00:00
|
|
|
STACK_OF(X509_NAME) *ca_sk=NULL;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
n=s->method->ssl_get_message(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
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)
|
|
|
|
{
|
2007-02-17 06:45:38 +00:00
|
|
|
if (s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
|
1998-12-21 10:56:39 +00:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-03-15 23:15:26 +00:00
|
|
|
p=d=(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));
|
|
|
|
}
|
2007-08-11 23:18:29 +00:00
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
|
|
|
int ssl3_get_new_session_ticket(SSL *s)
|
|
|
|
{
|
|
|
|
int ok,al,ret=0, ticklen;
|
|
|
|
long n;
|
|
|
|
const unsigned char *p;
|
|
|
|
unsigned char *d;
|
|
|
|
|
|
|
|
n=s->method->ssl_get_message(s,
|
|
|
|
SSL3_ST_CR_SESSION_TICKET_A,
|
|
|
|
SSL3_ST_CR_SESSION_TICKET_B,
|
|
|
|
-1,
|
|
|
|
16384,
|
|
|
|
&ok);
|
|
|
|
|
|
|
|
if (!ok)
|
|
|
|
return((int)n);
|
|
|
|
|
|
|
|
if (s->s3->tmp.message_type == SSL3_MT_FINISHED)
|
|
|
|
{
|
|
|
|
s->s3->tmp.reuse_message=1;
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
if (s->s3->tmp.message_type != SSL3_MT_NEWSESSION_TICKET)
|
|
|
|
{
|
|
|
|
al=SSL_AD_UNEXPECTED_MESSAGE;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_BAD_MESSAGE_TYPE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (n < 6)
|
|
|
|
{
|
|
|
|
/* need at least ticket_lifetime_hint + ticket length */
|
|
|
|
al = SSL3_AL_FATAL,SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
2009-12-08 11:37:40 +00:00
|
|
|
|
2007-08-11 23:18:29 +00:00
|
|
|
p=d=(unsigned char *)s->init_msg;
|
|
|
|
n2l(p, s->session->tlsext_tick_lifetime_hint);
|
|
|
|
n2s(p, ticklen);
|
|
|
|
/* ticket_lifetime_hint + ticket_length + ticket */
|
|
|
|
if (ticklen + 6 != n)
|
|
|
|
{
|
|
|
|
al = SSL3_AL_FATAL,SSL_AD_DECODE_ERROR;
|
2007-09-21 06:54:24 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
|
2007-08-11 23:18:29 +00:00
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (s->session->tlsext_tick)
|
|
|
|
{
|
|
|
|
OPENSSL_free(s->session->tlsext_tick);
|
|
|
|
s->session->tlsext_ticklen = 0;
|
|
|
|
}
|
|
|
|
s->session->tlsext_tick = OPENSSL_malloc(ticklen);
|
|
|
|
if (!s->session->tlsext_tick)
|
|
|
|
{
|
2007-09-21 06:54:24 +00:00
|
|
|
SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,ERR_R_MALLOC_FAILURE);
|
2007-08-11 23:18:29 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
memcpy(s->session->tlsext_tick, p, ticklen);
|
|
|
|
s->session->tlsext_ticklen = ticklen;
|
2009-10-30 14:06:03 +00:00
|
|
|
/* There are two ways to detect a resumed ticket sesion.
|
|
|
|
* One is to set an appropriate session ID and then the server
|
|
|
|
* must return a match in ServerHello. This allows the normal
|
|
|
|
* client session ID matching to work and we know much
|
|
|
|
* earlier that the ticket has been accepted.
|
|
|
|
*
|
|
|
|
* The other way is to set zero length session ID when the
|
|
|
|
* ticket is presented and rely on the handshake to determine
|
|
|
|
* session resumption.
|
|
|
|
*
|
|
|
|
* We choose the former approach because this fits in with
|
|
|
|
* assumptions elsewhere in OpenSSL. The session ID is set
|
|
|
|
* to the SHA256 (or SHA1 is SHA256 is disabled) hash of the
|
|
|
|
* ticket.
|
|
|
|
*/
|
|
|
|
EVP_Digest(p, ticklen,
|
|
|
|
s->session->session_id, &s->session->session_id_length,
|
|
|
|
#ifndef OPENSSL_NO_SHA256
|
|
|
|
EVP_sha256(), NULL);
|
|
|
|
#else
|
|
|
|
EVP_sha1(), NULL);
|
|
|
|
#endif
|
2007-08-11 23:18:29 +00:00
|
|
|
ret=1;
|
|
|
|
return(ret);
|
|
|
|
f_err:
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,al);
|
|
|
|
err:
|
|
|
|
return(-1);
|
|
|
|
}
|
2007-09-26 21:56:59 +00:00
|
|
|
|
|
|
|
int ssl3_get_cert_status(SSL *s)
|
|
|
|
{
|
|
|
|
int ok, al;
|
2008-01-05 21:35:34 +00:00
|
|
|
unsigned long resplen,n;
|
2007-09-26 21:56:59 +00:00
|
|
|
const unsigned char *p;
|
|
|
|
|
|
|
|
n=s->method->ssl_get_message(s,
|
|
|
|
SSL3_ST_CR_CERT_STATUS_A,
|
|
|
|
SSL3_ST_CR_CERT_STATUS_B,
|
|
|
|
SSL3_MT_CERTIFICATE_STATUS,
|
|
|
|
16384,
|
|
|
|
&ok);
|
|
|
|
|
|
|
|
if (!ok) return((int)n);
|
|
|
|
if (n < 4)
|
|
|
|
{
|
|
|
|
/* need at least status type + length */
|
|
|
|
al = SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_LENGTH_MISMATCH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
p = (unsigned char *)s->init_msg;
|
|
|
|
if (*p++ != TLSEXT_STATUSTYPE_ocsp)
|
|
|
|
{
|
|
|
|
al = SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_UNSUPPORTED_STATUS_TYPE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
n2l3(p, resplen);
|
|
|
|
if (resplen + 4 != n)
|
|
|
|
{
|
|
|
|
al = SSL_AD_DECODE_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_LENGTH_MISMATCH);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (s->tlsext_ocsp_resp)
|
|
|
|
OPENSSL_free(s->tlsext_ocsp_resp);
|
|
|
|
s->tlsext_ocsp_resp = BUF_memdup(p, resplen);
|
|
|
|
if (!s->tlsext_ocsp_resp)
|
|
|
|
{
|
|
|
|
al = SSL_AD_INTERNAL_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_CERT_STATUS,ERR_R_MALLOC_FAILURE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
s->tlsext_ocsp_resplen = resplen;
|
|
|
|
if (s->ctx->tlsext_status_cb)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
ret = s->ctx->tlsext_status_cb(s, s->ctx->tlsext_status_arg);
|
|
|
|
if (ret == 0)
|
|
|
|
{
|
|
|
|
al = SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_INVALID_STATUS_RESPONSE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
if (ret < 0)
|
|
|
|
{
|
|
|
|
al = SSL_AD_INTERNAL_ERROR;
|
|
|
|
SSLerr(SSL_F_SSL3_GET_CERT_STATUS,ERR_R_MALLOC_FAILURE);
|
|
|
|
goto f_err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
f_err:
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,al);
|
|
|
|
return(-1);
|
|
|
|
}
|
2007-08-11 23:18:29 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
int ssl3_get_server_done(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int ok,ret=0;
|
|
|
|
long n;
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
n=s->method->ssl_get_message(s,
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2003-02-28 15:37:10 +00:00
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
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;
|
2007-02-17 06:45:38 +00:00
|
|
|
unsigned long alg_k;
|
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
|
2003-02-28 15:07:10 +00:00
|
|
|
KSSL_ERR kssl_err;
|
2001-02-20 08:13:47 +00:00
|
|
|
#endif /* OPENSSL_NO_KRB5 */
|
2002-08-09 08:56:08 +00:00
|
|
|
#ifndef OPENSSL_NO_ECDH
|
|
|
|
EC_KEY *clnt_ecdh = NULL;
|
2005-05-16 10:11:04 +00:00
|
|
|
const EC_POINT *srvr_ecpoint = NULL;
|
2002-08-09 08:56:08 +00:00
|
|
|
EVP_PKEY *srvr_pub_pkey = NULL;
|
|
|
|
unsigned char *encodedPoint = NULL;
|
|
|
|
int encoded_pt_len = 0;
|
|
|
|
BN_CTX * bn_ctx = NULL;
|
|
|
|
#endif
|
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]);
|
|
|
|
|
2007-02-17 06:45:38 +00:00
|
|
|
alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
/* Fool emacs indentation */
|
|
|
|
if (0) {}
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_RSA
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k & 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-13 15:43:43 +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-13 15:43:43 +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-13 15:43:43 +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-13 15:43:43 +00:00
|
|
|
tmp_buf,sizeof tmp_buf);
|
2002-11-28 08:04:36 +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
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k & SSL_kKRB5)
|
2003-02-28 15:07:10 +00:00
|
|
|
{
|
|
|
|
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;
|
2001-07-09 21:46:58 +00:00
|
|
|
EVP_CIPHER_CTX ciph_ctx;
|
2009-04-23 16:32:42 +00:00
|
|
|
const EVP_CIPHER *enc = NULL;
|
2001-07-09 21:46:58 +00:00
|
|
|
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:22:23 +00:00
|
|
|
EVP_CIPHER_CTX_init(&ciph_ctx);
|
|
|
|
|
2000-11-30 22:53:34 +00:00
|
|
|
#ifdef KSSL_DEBUG
|
2003-02-28 15:07:10 +00:00
|
|
|
printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
|
2007-02-19 14:53:18 +00:00
|
|
|
alg_k, SSL_kKRB5);
|
2000-11-30 22:53:34 +00:00
|
|
|
#endif /* KSSL_DEBUG */
|
|
|
|
|
2001-07-09 21:46:58 +00:00
|
|
|
authp = NULL;
|
|
|
|
#ifdef KRB5SENDAUTH
|
|
|
|
if (KRB5SENDAUTH) authp = &authenticator;
|
|
|
|
#endif /* KRB5SENDAUTH */
|
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
|
2001-07-09 21:46:58 +00:00
|
|
|
&kssl_err);
|
|
|
|
enc = kssl_map_enc(kssl_ctx->enctype);
|
2003-02-28 15:07:10 +00:00
|
|
|
if (enc == NULL)
|
|
|
|
goto err;
|
2000-11-30 22:53:34 +00:00
|
|
|
#ifdef KSSL_DEBUG
|
2003-02-28 15:07:10 +00:00
|
|
|
{
|
|
|
|
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);
|
2003-02-28 15:07:10 +00:00
|
|
|
}
|
2000-11-30 22:53:34 +00:00
|
|
|
#endif /* KSSL_DEBUG */
|
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
if (krb5rc)
|
|
|
|
{
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,
|
2001-07-09 21:46:58 +00:00
|
|
|
SSL_AD_HANDSHAKE_FAILURE);
|
2003-02-28 15:07:10 +00:00
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
2001-07-09 21:46:58 +00:00
|
|
|
kssl_err.reason);
|
2003-02-28 15:07:10 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2000-11-30 22:53:34 +00:00
|
|
|
|
2001-07-09 21:46:58 +00:00
|
|
|
/* 20010406 VRS - Earlier versions used KRB5 AP_REQ
|
|
|
|
** in place of RFC 2712 KerberosWrapper, as in:
|
|
|
|
**
|
2003-02-28 15:07:10 +00:00
|
|
|
** 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);
|
|
|
|
**
|
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;
|
|
|
|
}
|
|
|
|
|
2006-09-28 12:22:58 +00:00
|
|
|
tmp_buf[0]=s->client_version>>8;
|
|
|
|
tmp_buf[1]=s->client_version&0xff;
|
|
|
|
if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
|
|
|
|
goto err;
|
2001-07-09 21:46:58 +00:00
|
|
|
|
|
|
|
/* 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-13 15:43:43 +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-13 15:43:43 +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;
|
2009-04-23 16:32:42 +00:00
|
|
|
if (outl > (int)sizeof epms)
|
2002-08-02 11:48:15 +00:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
s->session->master_key_length=
|
2007-02-17 06:45:38 +00:00
|
|
|
s->method->ssl3_enc->generate_master_secret(s,
|
2001-07-09 21:46:58 +00:00
|
|
|
s->session->master_key,
|
2002-11-13 15:43:43 +00:00
|
|
|
tmp_buf, sizeof tmp_buf);
|
2001-07-09 21:46:58 +00:00
|
|
|
|
2002-11-28 08:04:36 +00:00
|
|
|
OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
|
|
|
|
OPENSSL_cleanse(epms, outl);
|
2003-02-28 15:07:10 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
#endif
|
2001-02-20 08:13:47 +00:00
|
|
|
#ifndef OPENSSL_NO_DH
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
DH *dh_srvr,*dh_clnt;
|
|
|
|
|
2008-05-28 22:17:34 +00:00
|
|
|
if (s->session->sess_cert == NULL)
|
|
|
|
{
|
|
|
|
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
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
|
2002-08-09 08:56:08 +00:00
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_ECDH
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe))
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
2005-05-16 10:11:04 +00:00
|
|
|
const EC_GROUP *srvr_group = NULL;
|
|
|
|
EC_KEY *tkey;
|
2002-08-09 08:56:08 +00:00
|
|
|
int ecdh_clnt_cert = 0;
|
2003-07-22 12:34:21 +00:00
|
|
|
int field_size = 0;
|
2002-08-09 08:56:08 +00:00
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*/
|
2007-02-17 06:45:38 +00:00
|
|
|
if ((alg_k & (SSL_kECDHr|SSL_kECDHe)) && (s->cert != NULL))
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
/* 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 ==
|
2002-08-12 08:51:30 +00:00
|
|
|
* EVP_PKEY_EC) && ...)
|
2002-08-09 08:56:08 +00:00
|
|
|
* ecdh_clnt_cert = 1;
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->session->sess_cert->peer_ecdh_tmp != NULL)
|
|
|
|
{
|
2005-05-16 10:11:04 +00:00
|
|
|
tkey = s->session->sess_cert->peer_ecdh_tmp;
|
2002-08-09 08:56:08 +00:00
|
|
|
}
|
|
|
|
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) ||
|
2002-08-12 08:47:41 +00:00
|
|
|
(srvr_pub_pkey->type != EVP_PKEY_EC) ||
|
2005-05-16 10:11:04 +00:00
|
|
|
(srvr_pub_pkey->pkey.ec == NULL))
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2005-05-16 10:11:04 +00:00
|
|
|
tkey = srvr_pub_pkey->pkey.ec;
|
2002-08-09 08:56:08 +00:00
|
|
|
}
|
|
|
|
|
2005-05-16 10:11:04 +00:00
|
|
|
srvr_group = EC_KEY_get0_group(tkey);
|
|
|
|
srvr_ecpoint = EC_KEY_get0_public_key(tkey);
|
|
|
|
|
2002-08-09 08:56:08 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2005-05-16 10:11:04 +00:00
|
|
|
if (!EC_KEY_set_group(clnt_ecdh, srvr_group))
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_EC_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
2002-08-09 08:56:08 +00:00
|
|
|
if (ecdh_clnt_cert)
|
|
|
|
{
|
2003-02-28 15:07:10 +00:00
|
|
|
/* Reuse key info from our certificate
|
2002-08-09 08:56:08 +00:00
|
|
|
* We only need our private key to perform
|
|
|
|
* the ECDH computation.
|
|
|
|
*/
|
2005-05-16 10:11:04 +00:00
|
|
|
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;
|
|
|
|
}
|
2002-08-09 08:56:08 +00:00
|
|
|
}
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
/* use the 'p' output buffer for the ECDH key, but
|
|
|
|
* make sure to clear it out afterwards
|
2002-08-09 08:56:08 +00:00
|
|
|
*/
|
|
|
|
|
2005-05-16 10:11:04 +00:00
|
|
|
field_size = EC_GROUP_get_degree(srvr_group);
|
2003-07-22 12:34:21 +00:00
|
|
|
if (field_size <= 0)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
ERR_R_ECDH_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
2005-12-13 07:33:35 +00:00
|
|
|
n=ECDH_compute_key(p, (field_size+7)/8, srvr_ecpoint, clnt_ecdh, NULL);
|
2002-08-09 08:56:08 +00:00
|
|
|
if (n <= 0)
|
2003-02-28 15:07:10 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
2002-08-09 08:56:08 +00:00
|
|
|
ERR_R_ECDH_LIB);
|
2003-02-28 15:07:10 +00:00
|
|
|
goto err;
|
2002-08-09 08:56:08 +00:00
|
|
|
}
|
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
/* generate master key from the result */
|
|
|
|
s->session->master_key_length = s->method->ssl3_enc \
|
2002-08-09 08:56:08 +00:00
|
|
|
-> generate_master_secret(s,
|
|
|
|
s->session->master_key,
|
|
|
|
p, n);
|
|
|
|
|
2003-02-28 15:07:10 +00:00
|
|
|
memset(p, 0, n); /* clean up */
|
2002-08-09 08:56:08 +00:00
|
|
|
|
|
|
|
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 =
|
2005-05-16 10:11:04 +00:00
|
|
|
EC_POINT_point2oct(srvr_group,
|
|
|
|
EC_KEY_get0_public_key(clnt_ecdh),
|
2002-08-09 08:56:08 +00:00
|
|
|
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 */
|
2005-05-16 10:11:04 +00:00
|
|
|
n = EC_POINT_point2oct(srvr_group,
|
|
|
|
EC_KEY_get0_public_key(clnt_ecdh),
|
2002-08-09 08:56:08 +00:00
|
|
|
POINT_CONVERSION_UNCOMPRESSED,
|
|
|
|
encodedPoint, encoded_pt_len, bn_ctx);
|
|
|
|
|
|
|
|
*p = n; /* length of encoded point */
|
2003-02-28 15:07:10 +00:00
|
|
|
/* Encoded point will be copied here */
|
2002-08-09 08:56:08 +00:00
|
|
|
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 */
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
else if (alg_k & SSL_kGOST)
|
|
|
|
{
|
|
|
|
/* GOST key exchange message creation */
|
|
|
|
EVP_PKEY_CTX *pkey_ctx;
|
|
|
|
X509 *peer_cert;
|
|
|
|
size_t msglen;
|
|
|
|
unsigned int md_len;
|
|
|
|
int keytype;
|
2009-06-16 16:38:47 +00:00
|
|
|
unsigned char premaster_secret[32],shared_ukm[32], tmp[256];
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_MD_CTX *ukm_hash;
|
|
|
|
EVP_PKEY *pub_key;
|
|
|
|
|
|
|
|
/* Get server sertificate PKEY and create ctx from it */
|
|
|
|
peer_cert=s->session->sess_cert->peer_pkeys[(keytype=SSL_PKEY_GOST01)].x509;
|
|
|
|
if (!peer_cert)
|
|
|
|
peer_cert=s->session->sess_cert->peer_pkeys[(keytype=SSL_PKEY_GOST94)].x509;
|
|
|
|
if (!peer_cert) {
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
pkey_ctx=EVP_PKEY_CTX_new(pub_key=X509_get_pubkey(peer_cert),NULL);
|
|
|
|
/* If we have send a certificate, and certificate key
|
|
|
|
|
|
|
|
* parameters match those of server certificate, use
|
|
|
|
* certificate key for key exchange
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Otherwise, generate ephemeral key pair */
|
|
|
|
|
|
|
|
EVP_PKEY_encrypt_init(pkey_ctx);
|
|
|
|
/* Generate session key */
|
|
|
|
RAND_bytes(premaster_secret,32);
|
|
|
|
/* If we have client certificate, use its secret as peer key */
|
2009-06-16 16:38:47 +00:00
|
|
|
if (s->s3->tmp.cert_req && s->cert->key->privatekey) {
|
|
|
|
if (EVP_PKEY_derive_set_peer(pkey_ctx,s->cert->key->privatekey) <=0) {
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
/* If there was an error - just ignore it. Ephemeral key
|
|
|
|
* would be used
|
|
|
|
*/
|
|
|
|
ERR_clear_error();
|
2009-06-16 16:38:47 +00:00
|
|
|
}
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
}
|
|
|
|
/* Compute shared IV and store it in algorithm-specific
|
|
|
|
* context data */
|
|
|
|
ukm_hash = EVP_MD_CTX_create();
|
|
|
|
EVP_DigestInit(ukm_hash,EVP_get_digestbynid(NID_id_GostR3411_94));
|
|
|
|
EVP_DigestUpdate(ukm_hash,s->s3->client_random,SSL3_RANDOM_SIZE);
|
|
|
|
EVP_DigestUpdate(ukm_hash,s->s3->server_random,SSL3_RANDOM_SIZE);
|
|
|
|
EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len);
|
|
|
|
EVP_MD_CTX_destroy(ukm_hash);
|
|
|
|
if (EVP_PKEY_CTX_ctrl(pkey_ctx,-1,EVP_PKEY_OP_ENCRYPT,EVP_PKEY_CTRL_SET_IV,
|
|
|
|
8,shared_ukm)<0) {
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
SSL_R_LIBRARY_BUG);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* Make GOST keytransport blob message */
|
|
|
|
/*Encapsulate it into sequence */
|
|
|
|
*(p++)=V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED;
|
2009-06-16 16:38:47 +00:00
|
|
|
msglen=255;
|
|
|
|
if (EVP_PKEY_encrypt(pkey_ctx,tmp,&msglen,premaster_secret,32)<0) {
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
SSL_R_LIBRARY_BUG);
|
|
|
|
goto err;
|
2009-06-16 16:38:47 +00:00
|
|
|
}
|
|
|
|
if (msglen >= 0x80)
|
|
|
|
{
|
|
|
|
*(p++)=0x81;
|
|
|
|
*(p++)= msglen & 0xff;
|
|
|
|
n=msglen+3;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*(p++)= msglen & 0xff;
|
|
|
|
n=msglen+2;
|
|
|
|
}
|
|
|
|
memcpy(p, tmp, msglen);
|
|
|
|
/* Check if pubkey from client certificate was used */
|
|
|
|
if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
|
|
|
|
{
|
|
|
|
/* Set flag "skip certificate verify" */
|
|
|
|
s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;
|
|
|
|
}
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_CTX_free(pkey_ctx);
|
|
|
|
s->session->master_key_length=
|
|
|
|
s->method->ssl3_enc->generate_master_secret(s,
|
|
|
|
s->session->master_key,premaster_secret,32);
|
|
|
|
EVP_PKEY_free(pub_key);
|
|
|
|
|
|
|
|
}
|
2011-03-12 17:01:19 +00:00
|
|
|
#ifndef OPENSSL_NO_SRP
|
|
|
|
else if (alg_k & SSL_kSRP)
|
|
|
|
{
|
|
|
|
if (s->srp_ctx.A != NULL)
|
|
|
|
{
|
|
|
|
/* send off the data */
|
|
|
|
n=BN_num_bytes(s->srp_ctx.A);
|
|
|
|
s2n(n,p);
|
|
|
|
BN_bn2bin(s->srp_ctx.A,p);
|
|
|
|
n+=2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (s->session->srp_username != NULL)
|
|
|
|
OPENSSL_free(s->session->srp_username);
|
|
|
|
s->session->srp_username = BUF_strdup(s->srp_ctx.login);
|
|
|
|
if (s->session->srp_username == NULL)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((s->session->master_key_length = SRP_generate_client_master_secret(s,s->session->master_key))<0)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2006-03-10 23:06:27 +00:00
|
|
|
#ifndef OPENSSL_NO_PSK
|
2007-02-17 06:45:38 +00:00
|
|
|
else if (alg_k & SSL_kPSK)
|
2006-03-10 23:06:27 +00:00
|
|
|
{
|
|
|
|
char identity[PSK_MAX_IDENTITY_LEN];
|
|
|
|
unsigned char *t = NULL;
|
|
|
|
unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4];
|
|
|
|
unsigned int pre_ms_len = 0, psk_len = 0;
|
|
|
|
int psk_err = 1;
|
|
|
|
|
|
|
|
n = 0;
|
|
|
|
if (s->psk_client_callback == NULL)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
SSL_R_PSK_NO_CLIENT_CB);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
psk_len = s->psk_client_callback(s, s->ctx->psk_identity_hint,
|
|
|
|
identity, PSK_MAX_IDENTITY_LEN,
|
|
|
|
psk_or_pre_ms, sizeof(psk_or_pre_ms));
|
|
|
|
if (psk_len > PSK_MAX_PSK_LEN)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
goto psk_err;
|
|
|
|
}
|
|
|
|
else if (psk_len == 0)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
SSL_R_PSK_IDENTITY_NOT_FOUND);
|
|
|
|
goto psk_err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* create PSK pre_master_secret */
|
|
|
|
pre_ms_len = 2+psk_len+2+psk_len;
|
|
|
|
t = psk_or_pre_ms;
|
|
|
|
memmove(psk_or_pre_ms+psk_len+4, psk_or_pre_ms, psk_len);
|
|
|
|
s2n(psk_len, t);
|
|
|
|
memset(t, 0, psk_len);
|
|
|
|
t+=psk_len;
|
|
|
|
s2n(psk_len, t);
|
|
|
|
|
|
|
|
if (s->session->psk_identity_hint != NULL)
|
|
|
|
OPENSSL_free(s->session->psk_identity_hint);
|
|
|
|
s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
|
|
|
|
if (s->ctx->psk_identity_hint != NULL &&
|
|
|
|
s->session->psk_identity_hint == NULL)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
goto psk_err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->session->psk_identity != NULL)
|
|
|
|
OPENSSL_free(s->session->psk_identity);
|
|
|
|
s->session->psk_identity = BUF_strdup(identity);
|
|
|
|
if (s->session->psk_identity == NULL)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
goto psk_err;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->session->master_key_length =
|
|
|
|
s->method->ssl3_enc->generate_master_secret(s,
|
|
|
|
s->session->master_key,
|
|
|
|
psk_or_pre_ms, pre_ms_len);
|
|
|
|
n = strlen(identity);
|
|
|
|
s2n(n, p);
|
|
|
|
memcpy(p, identity, n);
|
|
|
|
n+=2;
|
|
|
|
psk_err = 0;
|
|
|
|
psk_err:
|
|
|
|
OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN);
|
2007-02-17 06:45:38 +00:00
|
|
|
OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
|
2006-03-10 23:06:27 +00:00
|
|
|
if (psk_err != 0)
|
|
|
|
{
|
|
|
|
ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2000-11-30 22:53:34 +00:00
|
|
|
else
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
2002-08-09 08:56:08 +00:00
|
|
|
ssl3_send_alert(s, SSL3_AL_FATAL,
|
|
|
|
SSL_AD_HANDSHAKE_FAILURE);
|
|
|
|
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:
|
2002-08-09 08:56:08 +00:00
|
|
|
#ifndef OPENSSL_NO_ECDH
|
|
|
|
BN_CTX_free(bn_ctx);
|
|
|
|
if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
|
|
|
|
if (clnt_ecdh != NULL)
|
|
|
|
EC_KEY_free(clnt_ecdh);
|
2003-02-28 15:07:10 +00:00
|
|
|
EVP_PKEY_free(srvr_pub_pkey);
|
2002-08-09 08:56:08 +00:00
|
|
|
#endif
|
1998-12-21 10:52:47 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
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;
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_CTX *pctx=NULL;
|
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;
|
1998-12-21 10:56:39 +00:00
|
|
|
int j;
|
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;
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
/* Create context from key and test if sha1 is allowed as digest */
|
|
|
|
pctx = EVP_PKEY_CTX_new(pkey,NULL);
|
|
|
|
EVP_PKEY_sign_init(pctx);
|
|
|
|
if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1())>0)
|
|
|
|
{
|
|
|
|
s->method->ssl3_enc->cert_verify_mac(s,
|
|
|
|
NID_sha1,
|
|
|
|
&(data[MD5_DIGEST_LENGTH]));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ERR_clear_error();
|
|
|
|
}
|
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,
|
2007-08-31 12:42:53 +00:00
|
|
|
NID_md5,
|
|
|
|
&(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
|
2002-08-09 08:56:08 +00:00
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_ECDSA
|
2002-08-12 08:47:41 +00:00
|
|
|
if (pkey->type == EVP_PKEY_EC)
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
if (!ECDSA_sign(pkey->save_type,
|
|
|
|
&(data[MD5_DIGEST_LENGTH]),
|
|
|
|
SHA_DIGEST_LENGTH,&(p[2]),
|
2005-05-16 10:11:04 +00:00
|
|
|
(unsigned int *)&j,pkey->pkey.ec))
|
2002-08-09 08:56:08 +00:00
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
|
|
|
|
ERR_R_ECDSA_LIB);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
s2n(j,p);
|
|
|
|
n=j+2;
|
|
|
|
}
|
|
|
|
else
|
1998-12-21 10:52:47 +00:00
|
|
|
#endif
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001)
|
|
|
|
{
|
|
|
|
unsigned char signbuf[64];
|
|
|
|
int i;
|
2007-12-14 16:53:50 +00:00
|
|
|
size_t sigsize=64;
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
s->method->ssl3_enc->cert_verify_mac(s,
|
|
|
|
NID_id_GostR3411_94,
|
|
|
|
data);
|
2009-09-13 11:29:29 +00:00
|
|
|
if (EVP_PKEY_sign(pctx, signbuf, &sigsize, data, 32) <= 0) {
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
for (i=63,j=0; i>=0; j++, i--) {
|
|
|
|
p[2+j]=signbuf[i];
|
|
|
|
}
|
|
|
|
s2n(j,p);
|
|
|
|
n=j+2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
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;
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
*(d++)=SSL3_MT_CERTIFICATE_VERIFY;
|
|
|
|
l2n3(n,d);
|
|
|
|
|
2003-09-27 19:32:06 +00:00
|
|
|
s->state=SSL3_ST_CW_CERT_VRFY_B;
|
1998-12-21 10:52:47 +00:00
|
|
|
s->init_num=(int)n+4;
|
|
|
|
s->init_off=0;
|
|
|
|
}
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_CTX_free(pctx);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
|
|
|
|
err:
|
1. Changes for s_client.c to make it return non-zero exit code in case
of handshake failure
2. Changes to x509_certificate_type function (crypto/x509/x509type.c) to
make it recognize GOST certificates as EVP_PKT_SIGN|EVP_PKT_EXCH
(required for s3_srvr to accept GOST client certificates).
3. Changes to EVP
- adding of function EVP_PKEY_CTX_get0_peerkey
- Make function EVP_PKEY_derive_set_peerkey work for context with
ENCRYPT operation, because we use peerkey field in the context to
pass non-ephemeral secret key to GOST encrypt operation.
- added EVP_PKEY_CTRL_SET_IV control command. It is really
GOST-specific, but it is used in SSL code, so it has to go
in some header file, available during libssl compilation
4. Fix to HMAC to avoid call of OPENSSL_cleanse on undefined data
5. Include des.h if KSSL_DEBUG is defined into some libssl files, to
make debugging output which depends on constants defined there, work
and other KSSL_DEBUG output fixes
6. Declaration of real GOST ciphersuites, two authentication methods
SSL_aGOST94 and SSL_aGOST2001 and one key exchange method SSL_kGOST
7. Implementation of these methods.
8. Support for sending unsolicited serverhello extension if GOST
ciphersuite is selected. It is require for interoperability with
CryptoPro CSP 3.0 and 3.6 and controlled by
SSL_OP_CRYPTOPRO_TLSEXT_BUG constant.
This constant is added to SSL_OP_ALL, because it does nothing, if
non-GOST ciphersuite is selected, and all implementation of GOST
include compatibility with CryptoPro.
9. Support for CertificateVerify message without length field. It is
another CryptoPro bug, but support is made unconditional, because it
does no harm for draft-conforming implementation.
10. In tls1_mac extra copy of stream mac context is no more done.
When I've written currently commited code I haven't read
EVP_DigestSignFinal manual carefully enough and haven't noticed that
it does an internal digest ctx copying.
This implementation was tested against
1. CryptoPro CSP 3.6 client and server
2. Cryptopro CSP 3.0 server
2007-10-26 12:06:36 +00:00
|
|
|
EVP_PKEY_CTX_free(pctx);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
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;
|
2008-06-01 22:33:24 +00:00
|
|
|
i = ssl_do_client_cert_cb(s, &x509, &pkey);
|
1998-12-21 10:52:47 +00:00
|
|
|
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))
|
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
int ssl3_check_cert_and_algorithm(SSL *s)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int i,idx;
|
2007-02-17 06:45:38 +00:00
|
|
|
long alg_k,alg_a;
|
1998-12-21 10:52:47 +00:00
|
|
|
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
|
|
|
|
2007-02-17 06:45:38 +00:00
|
|
|
alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
|
|
|
|
alg_a=s->s3->tmp.new_cipher->algorithm_auth;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* we don't have a certificate */
|
2007-02-17 06:45:38 +00:00
|
|
|
if ((alg_a & (SSL_aDH|SSL_aNULL|SSL_aKRB5)) || (alg_k & SSL_kPSK))
|
1998-12-21 10:52:47 +00:00
|
|
|
return(1);
|
|
|
|
|
2010-02-27 23:02:41 +00:00
|
|
|
sc=s->session->sess_cert;
|
|
|
|
if (sc == NULL)
|
|
|
|
{
|
|
|
|
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
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;
|
2002-08-09 08:56:08 +00:00
|
|
|
#ifndef OPENSSL_NO_ECDH
|
|
|
|
if (idx == SSL_PKEY_ECC)
|
|
|
|
{
|
2006-06-15 19:58:22 +00:00
|
|
|
if (ssl_check_srvr_ecc_cert_and_alg(sc->peer_pkeys[idx].x509,
|
2002-08-09 08:56:08 +00:00
|
|
|
s->s3->tmp.new_cipher) == 0)
|
|
|
|
{ /* check failed */
|
|
|
|
SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_BAD_ECC_CERT);
|
2007-02-17 06:45:38 +00:00
|
|
|
goto f_err;
|
2002-08-09 08:56:08 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1999-05-13 15:09:38 +00:00
|
|
|
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 */
|
2007-02-17 06:45:38 +00:00
|
|
|
if ((alg_a & SSL_aRSA) && !has_bits(i,EVP_PK_RSA|EVP_PKT_SIGN))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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
|
2007-02-17 06:45:38 +00:00
|
|
|
else if ((alg_a & SSL_aDSS) && !has_bits(i,EVP_PK_DSA|EVP_PKT_SIGN))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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
|
2007-02-17 06:45:38 +00:00
|
|
|
if ((alg_k & SSL_kRSA) &&
|
1998-12-21 10:52:47 +00:00
|
|
|
!(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
|
2007-02-17 06:45:38 +00:00
|
|
|
if ((alg_k & 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;
|
|
|
|
}
|
2007-02-17 06:45:38 +00:00
|
|
|
else if ((alg_k & SSL_kDHr) && !has_bits(i,EVP_PK_DH|EVP_PKS_RSA))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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
|
2007-02-17 06:45:38 +00:00
|
|
|
else if ((alg_k & SSL_kDHd) && !has_bits(i,EVP_PK_DH|EVP_PKS_DSA))
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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
|
2007-02-17 06:45:38 +00:00
|
|
|
if (alg_k & SSL_kRSA)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-02-21 20:03:24 +00:00
|
|
|
if (rsa == NULL
|
2003-11-28 23:03:14 +00:00
|
|
|
|| RSA_size(rsa)*8 > 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
|
2007-02-17 06:45:38 +00:00
|
|
|
if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
|
1999-02-21 20:03:24 +00:00
|
|
|
{
|
|
|
|
if (dh == NULL
|
2003-11-28 23:03:14 +00:00
|
|
|
|| DH_size(dh)*8 > 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);
|
|
|
|
}
|
2007-08-11 23:18:29 +00:00
|
|
|
|
|
|
|
/* Check to see if handshake is full or resumed. Usually this is just a
|
|
|
|
* case of checking to see if a cache hit has occurred. In the case of
|
|
|
|
* session tickets we have to check the next message to be sure.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_TLSEXT
|
2010-09-05 17:14:01 +00:00
|
|
|
# ifndef OPENSSL_NO_NEXTPROTONEG
|
2010-07-28 10:06:55 +00:00
|
|
|
int ssl3_send_next_proto(SSL *s)
|
|
|
|
{
|
|
|
|
unsigned int len, padding_len;
|
|
|
|
unsigned char *d;
|
|
|
|
|
|
|
|
if (s->state == SSL3_ST_CW_NEXT_PROTO_A)
|
|
|
|
{
|
|
|
|
len = s->next_proto_negotiated_len;
|
|
|
|
padding_len = 32 - ((len + 2) % 32);
|
|
|
|
d = (unsigned char *)s->init_buf->data;
|
|
|
|
d[4] = len;
|
|
|
|
memcpy(d + 5, s->next_proto_negotiated, len);
|
|
|
|
d[5 + len] = padding_len;
|
|
|
|
memset(d + 6 + len, 0, padding_len);
|
|
|
|
*(d++)=SSL3_MT_NEXT_PROTO;
|
|
|
|
l2n3(2 + len + padding_len, d);
|
|
|
|
s->state = SSL3_ST_CW_NEXT_PROTO_B;
|
|
|
|
s->init_num = 4 + 2 + len + padding_len;
|
|
|
|
s->init_off = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ssl3_do_write(s, SSL3_RT_HANDSHAKE);
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
|
2009-12-08 11:37:40 +00:00
|
|
|
int ssl3_check_finished(SSL *s)
|
2007-08-11 23:18:29 +00:00
|
|
|
{
|
|
|
|
int ok;
|
|
|
|
long n;
|
2008-11-15 17:18:12 +00:00
|
|
|
/* If we have no ticket it cannot be a resumed session. */
|
|
|
|
if (!s->session->tlsext_tick)
|
2007-08-11 23:18:29 +00:00
|
|
|
return 1;
|
|
|
|
/* this function is called when we really expect a Certificate
|
|
|
|
* message, so permit appropriate message length */
|
|
|
|
n=s->method->ssl_get_message(s,
|
|
|
|
SSL3_ST_CR_CERT_A,
|
|
|
|
SSL3_ST_CR_CERT_B,
|
|
|
|
-1,
|
|
|
|
s->max_cert_list,
|
|
|
|
&ok);
|
|
|
|
if (!ok) return((int)n);
|
|
|
|
s->s3->tmp.reuse_message = 1;
|
|
|
|
if ((s->s3->tmp.message_type == SSL3_MT_FINISHED)
|
|
|
|
|| (s->s3->tmp.message_type == SSL3_MT_NEWSESSION_TICKET))
|
|
|
|
return 2;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
2008-06-01 22:33:24 +00:00
|
|
|
|
|
|
|
int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey)
|
|
|
|
{
|
|
|
|
int i = 0;
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
if (s->ctx->client_cert_engine)
|
|
|
|
{
|
|
|
|
i = ENGINE_load_ssl_client_cert(s->ctx->client_cert_engine, s,
|
|
|
|
SSL_get_client_CA_list(s),
|
2008-06-01 22:45:08 +00:00
|
|
|
px509, ppkey, NULL, NULL, NULL);
|
2008-06-01 22:33:24 +00:00
|
|
|
if (i != 0)
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (s->ctx->client_cert_cb)
|
|
|
|
i = s->ctx->client_cert_cb(s,px509,ppkey);
|
|
|
|
return i;
|
|
|
|
}
|