Resolve conflicts.
This commit is contained in:
parent
a61825c7f3
commit
c21ce79893
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=89840
@ -605,8 +605,6 @@ int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
|
||||
char *out, int *outl);
|
||||
int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
|
||||
|
||||
void ERR_load_EVP_strings(void );
|
||||
|
||||
void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
|
||||
int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
|
||||
int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
|
||||
@ -779,6 +777,7 @@ void EVP_PBE_cleanup(void);
|
||||
/* The following lines are auto generated by the script mkerr.pl. Any changes
|
||||
* made after this point may be overwritten when the script is next run.
|
||||
*/
|
||||
void ERR_load_EVP_strings(void);
|
||||
|
||||
/* Error codes for the EVP functions. */
|
||||
|
||||
@ -851,4 +850,3 @@ void EVP_PBE_cleanup(void);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -203,8 +203,6 @@ RSA_METHOD *RSA_PKCS1_SSLeay(void);
|
||||
|
||||
RSA_METHOD *RSA_null_method(void);
|
||||
|
||||
void ERR_load_RSA_strings(void );
|
||||
|
||||
RSA * d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length);
|
||||
int i2d_RSAPublicKey(RSA *a, unsigned char **pp);
|
||||
RSA * d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length);
|
||||
@ -276,6 +274,7 @@ void *RSA_get_ex_data(RSA *r, int idx);
|
||||
/* The following lines are auto generated by the script mkerr.pl. Any changes
|
||||
* made after this point may be overwritten when the script is next run.
|
||||
*/
|
||||
void ERR_load_RSA_strings(void);
|
||||
|
||||
/* Error codes for the RSA functions. */
|
||||
|
||||
@ -317,6 +316,7 @@ void *RSA_get_ex_data(RSA *r, int idx);
|
||||
#define RSA_R_DATA_GREATER_THAN_MOD_LEN 108
|
||||
#define RSA_R_DATA_TOO_LARGE 109
|
||||
#define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 110
|
||||
#define RSA_R_DATA_TOO_LARGE_FOR_MODULUS 132
|
||||
#define RSA_R_DATA_TOO_SMALL 111
|
||||
#define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE 122
|
||||
#define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY 112
|
||||
@ -343,4 +343,3 @@ void *RSA_get_ex_data(RSA *r, int idx);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@ -79,8 +79,8 @@ static int RSA_eay_finish(RSA *rsa);
|
||||
static RSA_METHOD rsa_pkcs1_eay_meth={
|
||||
"Eric Young's PKCS#1 RSA",
|
||||
RSA_eay_public_encrypt,
|
||||
RSA_eay_public_decrypt,
|
||||
RSA_eay_private_encrypt,
|
||||
RSA_eay_public_decrypt, /* signature verification */
|
||||
RSA_eay_private_encrypt, /* signing */
|
||||
RSA_eay_private_decrypt,
|
||||
RSA_eay_mod_exp,
|
||||
BN_mod_exp_mont,
|
||||
@ -137,6 +137,13 @@ static int RSA_eay_public_encrypt(int flen, unsigned char *from,
|
||||
|
||||
if (BN_bin2bn(buf,num,&f) == NULL) goto err;
|
||||
|
||||
if (BN_ucmp(&f, rsa->n) >= 0)
|
||||
{
|
||||
/* usually the padding functions would catch this */
|
||||
RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
|
||||
{
|
||||
BN_MONT_CTX* bn_mont_ctx;
|
||||
@ -184,6 +191,7 @@ static int RSA_eay_public_encrypt(int flen, unsigned char *from,
|
||||
return(r);
|
||||
}
|
||||
|
||||
/* signing */
|
||||
static int RSA_eay_private_encrypt(int flen, unsigned char *from,
|
||||
unsigned char *to, RSA *rsa, int padding)
|
||||
{
|
||||
@ -219,6 +227,13 @@ static int RSA_eay_private_encrypt(int flen, unsigned char *from,
|
||||
if (i <= 0) goto err;
|
||||
|
||||
if (BN_bin2bn(buf,num,&f) == NULL) goto err;
|
||||
|
||||
if (BN_ucmp(&f, rsa->n) >= 0)
|
||||
{
|
||||
/* usually the padding functions would catch this */
|
||||
RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if ((rsa->flags & RSA_FLAG_BLINDING) && (rsa->blinding == NULL))
|
||||
RSA_blinding_on(rsa,ctx);
|
||||
@ -293,6 +308,12 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from,
|
||||
/* make data into a big number */
|
||||
if (BN_bin2bn(from,(int)flen,&f) == NULL) goto err;
|
||||
|
||||
if (BN_ucmp(&f, rsa->n) >= 0)
|
||||
{
|
||||
RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
|
||||
goto err;
|
||||
}
|
||||
|
||||
if ((rsa->flags & RSA_FLAG_BLINDING) && (rsa->blinding == NULL))
|
||||
RSA_blinding_on(rsa,ctx);
|
||||
if (rsa->flags & RSA_FLAG_BLINDING)
|
||||
@ -353,6 +374,7 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from,
|
||||
return(r);
|
||||
}
|
||||
|
||||
/* signature verification */
|
||||
static int RSA_eay_public_decrypt(int flen, unsigned char *from,
|
||||
unsigned char *to, RSA *rsa, int padding)
|
||||
{
|
||||
@ -384,6 +406,13 @@ static int RSA_eay_public_decrypt(int flen, unsigned char *from,
|
||||
}
|
||||
|
||||
if (BN_bin2bn(from,flen,&f) == NULL) goto err;
|
||||
|
||||
if (BN_ucmp(&f, rsa->n) >= 0)
|
||||
{
|
||||
RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* do the decrypt */
|
||||
if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
|
||||
{
|
||||
|
@ -115,8 +115,8 @@ int ssl23_connect(SSL *s)
|
||||
else if (s->ctx->info_callback != NULL)
|
||||
cb=s->ctx->info_callback;
|
||||
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
s->in_handshake++;
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
|
@ -57,6 +57,59 @@
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <openssl/buffer.h>
|
||||
@ -114,8 +167,8 @@ int ssl23_accept(SSL *s)
|
||||
else if (s->ctx->info_callback != NULL)
|
||||
cb=s->ctx->info_callback;
|
||||
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
s->in_handshake++;
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
@ -181,9 +234,9 @@ int ssl23_accept(SSL *s)
|
||||
}
|
||||
}
|
||||
end:
|
||||
s->in_handshake--;
|
||||
if (cb != NULL)
|
||||
cb(s,SSL_CB_ACCEPT_EXIT,ret);
|
||||
s->in_handshake--;
|
||||
return(ret);
|
||||
}
|
||||
|
||||
@ -354,17 +407,22 @@ int ssl23_get_client_hello(SSL *s)
|
||||
/* We must look at client_version inside the Client Hello message
|
||||
* to get the correct minor version.
|
||||
* However if we have only a pathologically small fragment of the
|
||||
* Client Hello message, this would be difficult, we'd have
|
||||
* to read at least one additional record to find out.
|
||||
* This doesn't usually happen in real life, so we just complain
|
||||
* for now.
|
||||
*/
|
||||
* Client Hello message, this would be difficult, and we'd have
|
||||
* to read more records to find out.
|
||||
* No known SSL 3.0 client fragments ClientHello like this,
|
||||
* so we simply assume TLS 1.0 to avoid protocol version downgrade
|
||||
* attacks. */
|
||||
if (p[3] == 0 && p[4] < 6)
|
||||
{
|
||||
#if 0
|
||||
SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_TOO_SMALL);
|
||||
goto err;
|
||||
#else
|
||||
v[1] = TLS1_VERSION_MINOR;
|
||||
#endif
|
||||
}
|
||||
v[1]=p[10]; /* minor version according to client_version */
|
||||
else
|
||||
v[1]=p[10]; /* minor version according to client_version */
|
||||
if (v[1] >= TLS1_VERSION_MINOR)
|
||||
{
|
||||
if (!(s->options & SSL_OP_NO_TLSv1))
|
||||
@ -378,10 +436,21 @@ int ssl23_get_client_hello(SSL *s)
|
||||
type=3;
|
||||
}
|
||||
}
|
||||
else if (!(s->options & SSL_OP_NO_SSLv3))
|
||||
else
|
||||
{
|
||||
s->version=SSL3_VERSION;
|
||||
type=3;
|
||||
/* client requests SSL 3.0 */
|
||||
if (!(s->options & SSL_OP_NO_SSLv3))
|
||||
{
|
||||
s->version=SSL3_VERSION;
|
||||
type=3;
|
||||
}
|
||||
else if (!(s->options & SSL_OP_NO_TLSv1))
|
||||
{
|
||||
/* we won't be able to use TLS of course,
|
||||
* but this will send an appropriate alert */
|
||||
s->version=TLS1_VERSION;
|
||||
type=3;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if ((strncmp("GET ", (char *)p,4) == 0) ||
|
||||
|
@ -57,6 +57,59 @@
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ssl_locl.h"
|
||||
#ifndef NO_SSL2
|
||||
@ -120,8 +173,8 @@ int ssl2_connect(SSL *s)
|
||||
cb=s->ctx->info_callback;
|
||||
|
||||
/* init things to blank */
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
s->in_handshake++;
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
|
||||
for (;;)
|
||||
{
|
||||
@ -289,6 +342,7 @@ static int get_server_hello(SSL *s)
|
||||
unsigned char *buf;
|
||||
unsigned char *p;
|
||||
int i,j;
|
||||
unsigned long len;
|
||||
STACK_OF(SSL_CIPHER) *sk=NULL,*cl;
|
||||
|
||||
buf=(unsigned char *)s->init_buf->data;
|
||||
@ -298,6 +352,7 @@ static int get_server_hello(SSL *s)
|
||||
i=ssl2_read(s,(char *)&(buf[s->init_num]),11-s->init_num);
|
||||
if (i < (11-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_GET_SERVER_HELLO,i));
|
||||
s->init_num = 11;
|
||||
|
||||
if (*(p++) != SSL2_MT_SERVER_HELLO)
|
||||
{
|
||||
@ -326,18 +381,22 @@ static int get_server_hello(SSL *s)
|
||||
n2s(p,i); s->s2->tmp.csl=i;
|
||||
n2s(p,i); s->s2->tmp.conn_id_length=i;
|
||||
s->state=SSL2_ST_GET_SERVER_HELLO_B;
|
||||
s->init_num=0;
|
||||
}
|
||||
|
||||
/* SSL2_ST_GET_SERVER_HELLO_B */
|
||||
j=s->s2->tmp.cert_length+s->s2->tmp.csl+s->s2->tmp.conn_id_length
|
||||
- s->init_num;
|
||||
i=ssl2_read(s,(char *)&(buf[s->init_num]),j);
|
||||
len = 11 + (unsigned long)s->s2->tmp.cert_length + (unsigned long)s->s2->tmp.csl + (unsigned long)s->s2->tmp.conn_id_length;
|
||||
if (len > SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER)
|
||||
{
|
||||
SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_MESSAGE_TOO_LONG);
|
||||
return -1;
|
||||
}
|
||||
j = (int)len - s->init_num;
|
||||
i = ssl2_read(s,(char *)&(buf[s->init_num]),j);
|
||||
if (i != j) return(ssl2_part_read(s,SSL_F_GET_SERVER_HELLO,i));
|
||||
|
||||
/* things are looking good */
|
||||
|
||||
p=buf;
|
||||
p = buf + 11;
|
||||
if (s->hit)
|
||||
{
|
||||
if (s->s2->tmp.cert_length != 0)
|
||||
@ -647,11 +706,10 @@ static int client_certificate(SSL *s)
|
||||
unsigned char *p,*d;
|
||||
int i;
|
||||
unsigned int n;
|
||||
int cert_ch_len=0;
|
||||
int cert_ch_len;
|
||||
unsigned char *cert_ch;
|
||||
|
||||
buf=(unsigned char *)s->init_buf->data;
|
||||
cert_ch= &(buf[2]);
|
||||
|
||||
/* We have a cert associated with the SSL, so attach it to
|
||||
* the session if it does not have one */
|
||||
@ -662,6 +720,7 @@ static int client_certificate(SSL *s)
|
||||
SSL2_MAX_CERT_CHALLENGE_LENGTH+1-s->init_num);
|
||||
if (i<(SSL2_MIN_CERT_CHALLENGE_LENGTH+1-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_CLIENT_CERTIFICATE,i));
|
||||
s->init_num += i;
|
||||
|
||||
/* type=buf[0]; */
|
||||
/* type eq x509 */
|
||||
@ -671,7 +730,6 @@ static int client_certificate(SSL *s)
|
||||
SSLerr(SSL_F_CLIENT_CERTIFICATE,SSL_R_BAD_AUTHENTICATION_TYPE);
|
||||
return(-1);
|
||||
}
|
||||
cert_ch_len=i-1;
|
||||
|
||||
if ((s->cert == NULL) ||
|
||||
(s->cert->key->x509 == NULL) ||
|
||||
@ -683,6 +741,9 @@ static int client_certificate(SSL *s)
|
||||
s->state=SSL2_ST_SEND_CLIENT_CERTIFICATE_C;
|
||||
}
|
||||
|
||||
cert_ch = buf + 2;
|
||||
cert_ch_len = s->init_num - 2;
|
||||
|
||||
if (s->state == SSL2_ST_X509_GET_CLIENT_CERTIFICATE)
|
||||
{
|
||||
X509 *x509=NULL;
|
||||
@ -788,7 +849,7 @@ static int client_certificate(SSL *s)
|
||||
static int get_server_verify(SSL *s)
|
||||
{
|
||||
unsigned char *p;
|
||||
int i;
|
||||
int i, n, len;
|
||||
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
if (s->state == SSL2_ST_GET_SERVER_VERIFY_A)
|
||||
@ -796,9 +857,9 @@ static int get_server_verify(SSL *s)
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),1-s->init_num);
|
||||
if (i < (1-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i));
|
||||
s->init_num += i;
|
||||
|
||||
s->state= SSL2_ST_GET_SERVER_VERIFY_B;
|
||||
s->init_num=0;
|
||||
if (*p != SSL2_MT_SERVER_VERIFY)
|
||||
{
|
||||
if (p[0] != SSL2_MT_ERROR)
|
||||
@ -815,10 +876,13 @@ static int get_server_verify(SSL *s)
|
||||
}
|
||||
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),
|
||||
(unsigned int)s->s2->challenge_length-s->init_num);
|
||||
if (i < ((int)s->s2->challenge_length-s->init_num))
|
||||
len = 1 + s->s2->challenge_length;
|
||||
n = len - s->init_num;
|
||||
i = ssl2_read(s,(char *)&(p[s->init_num]),n);
|
||||
if (i < n)
|
||||
return(ssl2_part_read(s,SSL_F_GET_SERVER_VERIFY,i));
|
||||
p += 1;
|
||||
|
||||
if (memcmp(p,s->s2->challenge,(unsigned int)s->s2->challenge_length) != 0)
|
||||
{
|
||||
ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
|
||||
@ -832,7 +896,7 @@ static int get_server_finished(SSL *s)
|
||||
{
|
||||
unsigned char *buf;
|
||||
unsigned char *p;
|
||||
int i;
|
||||
int i, n, len;
|
||||
|
||||
buf=(unsigned char *)s->init_buf->data;
|
||||
p=buf;
|
||||
@ -841,7 +905,8 @@ static int get_server_finished(SSL *s)
|
||||
i=ssl2_read(s,(char *)&(buf[s->init_num]),1-s->init_num);
|
||||
if (i < (1-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_GET_SERVER_FINISHED,i));
|
||||
s->init_num=i;
|
||||
s->init_num += i;
|
||||
|
||||
if (*p == SSL2_MT_REQUEST_CERTIFICATE)
|
||||
{
|
||||
s->state=SSL2_ST_SEND_CLIENT_CERTIFICATE_A;
|
||||
@ -858,14 +923,15 @@ static int get_server_finished(SSL *s)
|
||||
SSLerr(SSL_F_GET_SERVER_FINISHED,SSL_R_PEER_ERROR);
|
||||
return(-1);
|
||||
}
|
||||
s->state=SSL_ST_OK;
|
||||
s->init_num=0;
|
||||
s->state=SSL2_ST_GET_SERVER_FINISHED_B;
|
||||
}
|
||||
|
||||
i=ssl2_read(s,(char *)&(buf[s->init_num]),
|
||||
SSL2_SSL_SESSION_ID_LENGTH-s->init_num);
|
||||
if (i < (SSL2_SSL_SESSION_ID_LENGTH-s->init_num))
|
||||
len = 1 + SSL2_SSL_SESSION_ID_LENGTH;
|
||||
n = len - s->init_num;
|
||||
i = ssl2_read(s,(char *)&(buf[s->init_num]), n);
|
||||
if (i < n) /* XXX could be shorter than SSL2_SSL_SESSION_ID_LENGTH, that's the maximum */
|
||||
return(ssl2_part_read(s,SSL_F_GET_SERVER_FINISHED,i));
|
||||
s->init_num += i;
|
||||
|
||||
if (!s->hit) /* new session */
|
||||
{
|
||||
@ -889,6 +955,7 @@ static int get_server_finished(SSL *s)
|
||||
}
|
||||
}
|
||||
}
|
||||
s->state = SSL_ST_OK;
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
@ -113,8 +113,8 @@ int ssl2_enc_init(SSL *s, int client)
|
||||
}
|
||||
|
||||
/* read/writes from s->s2->mac_data using length for encrypt and
|
||||
* decrypt. It sets the s->s2->padding, s->[rw]length and
|
||||
* s->s2->pad_data ptr if we are encrypting */
|
||||
* decrypt. It sets s->s2->padding and s->[rw]length
|
||||
* if we are encrypting */
|
||||
void ssl2_enc(SSL *s, int send)
|
||||
{
|
||||
EVP_CIPHER_CTX *ds;
|
||||
|
@ -56,7 +56,7 @@
|
||||
* [including the GNU Public Licence.]
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
|
||||
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
@ -131,7 +131,7 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek)
|
||||
unsigned char mac[MAX_MAC_SIZE];
|
||||
unsigned char *p;
|
||||
int i;
|
||||
unsigned int mac_size=0;
|
||||
unsigned int mac_size;
|
||||
|
||||
ssl2_read_again:
|
||||
if (SSL_in_init(s) && !s->in_handshake)
|
||||
@ -236,17 +236,25 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek)
|
||||
/* Data portion */
|
||||
if (s->s2->clear_text)
|
||||
{
|
||||
mac_size = 0;
|
||||
s->s2->mac_data=p;
|
||||
s->s2->ract_data=p;
|
||||
s->s2->pad_data=NULL;
|
||||
if (s->s2->padding)
|
||||
{
|
||||
SSLerr(SSL_F_SSL2_READ_INTERNAL,SSL_R_ILLEGAL_PADDING);
|
||||
return(-1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mac_size=EVP_MD_size(s->read_hash);
|
||||
s->s2->mac_data=p;
|
||||
s->s2->ract_data= &p[mac_size];
|
||||
s->s2->pad_data= &p[mac_size+
|
||||
s->s2->rlength-s->s2->padding];
|
||||
if (s->s2->padding + mac_size > s->s2->rlength)
|
||||
{
|
||||
SSLerr(SSL_F_SSL2_READ_INTERNAL,SSL_R_ILLEGAL_PADDING);
|
||||
return(-1);
|
||||
}
|
||||
}
|
||||
|
||||
s->s2->ract_data_length=s->s2->rlength;
|
||||
@ -594,10 +602,8 @@ static int do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len)
|
||||
s->s2->wact_data= &(s->s2->wbuf[3+mac_size]);
|
||||
/* we copy the data into s->s2->wbuf */
|
||||
memcpy(s->s2->wact_data,buf,len);
|
||||
#ifdef PURIFY
|
||||
if (p)
|
||||
memset(&(s->s2->wact_data[len]),0,p);
|
||||
#endif
|
||||
memset(&(s->s2->wact_data[len]),0,p); /* arbitrary padding */
|
||||
|
||||
if (!s->s2->clear_text)
|
||||
{
|
||||
@ -646,27 +652,36 @@ int ssl2_part_read(SSL *s, unsigned long f, int i)
|
||||
unsigned char *p;
|
||||
int j;
|
||||
|
||||
/* check for error */
|
||||
if ((s->init_num == 0) && (i >= 3))
|
||||
{
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
if (p[0] == SSL2_MT_ERROR)
|
||||
{
|
||||
j=(p[1]<<8)|p[2];
|
||||
SSLerr((int)f,ssl_mt_error(j));
|
||||
}
|
||||
}
|
||||
|
||||
if (i < 0)
|
||||
{
|
||||
/* ssl2_return_error(s); */
|
||||
/* for non-blocking io,
|
||||
* this is not fatal */
|
||||
* this is not necessarily fatal */
|
||||
return(i);
|
||||
}
|
||||
else
|
||||
{
|
||||
s->init_num+=i;
|
||||
|
||||
/* Check for error. While there are recoverable errors,
|
||||
* this function is not called when those must be expected;
|
||||
* any error detected here is fatal. */
|
||||
if (s->init_num >= 3)
|
||||
{
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
if (p[0] == SSL2_MT_ERROR)
|
||||
{
|
||||
j=(p[1]<<8)|p[2];
|
||||
SSLerr((int)f,ssl_mt_error(j));
|
||||
s->init_num -= 3;
|
||||
if (s->init_num > 0)
|
||||
memmove(p, p+3, s->init_num);
|
||||
}
|
||||
}
|
||||
|
||||
/* If it's not an error message, we have some error anyway --
|
||||
* the message was shorter than expected. This too is treated
|
||||
* as fatal (at least if SSL_get_error is asked for its opinion). */
|
||||
return(0);
|
||||
}
|
||||
}
|
||||
@ -677,7 +692,9 @@ int ssl2_do_write(SSL *s)
|
||||
|
||||
ret=ssl2_write(s,&s->init_buf->data[s->init_off],s->init_num);
|
||||
if (ret == s->init_num)
|
||||
{
|
||||
return(1);
|
||||
}
|
||||
if (ret < 0)
|
||||
return(-1);
|
||||
s->init_off+=ret;
|
||||
|
@ -57,6 +57,59 @@
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
/* ====================================================================
|
||||
* Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* openssl-core@openssl.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ssl_locl.h"
|
||||
#ifndef NO_SSL2
|
||||
@ -121,8 +174,8 @@ int ssl2_accept(SSL *s)
|
||||
cb=s->ctx->info_callback;
|
||||
|
||||
/* init things to blank */
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
s->in_handshake++;
|
||||
if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
|
||||
|
||||
if (s->cert == NULL)
|
||||
{
|
||||
@ -324,6 +377,7 @@ int ssl2_accept(SSL *s)
|
||||
static int get_client_master_key(SSL *s)
|
||||
{
|
||||
int is_export,i,n,keya,ek;
|
||||
unsigned long len;
|
||||
unsigned char *p;
|
||||
SSL_CIPHER *cp;
|
||||
const EVP_CIPHER *c;
|
||||
@ -336,6 +390,8 @@ static int get_client_master_key(SSL *s)
|
||||
|
||||
if (i < (10-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_GET_CLIENT_MASTER_KEY,i));
|
||||
s->init_num = 10;
|
||||
|
||||
if (*(p++) != SSL2_MT_CLIENT_MASTER_KEY)
|
||||
{
|
||||
if (p[-1] != SSL2_MT_ERROR)
|
||||
@ -364,15 +420,21 @@ static int get_client_master_key(SSL *s)
|
||||
n2s(p,i); s->s2->tmp.enc=i;
|
||||
n2s(p,i); s->session->key_arg_length=i;
|
||||
s->state=SSL2_ST_GET_CLIENT_MASTER_KEY_B;
|
||||
s->init_num=0;
|
||||
}
|
||||
|
||||
/* SSL2_ST_GET_CLIENT_MASTER_KEY_B */
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
keya=s->session->key_arg_length;
|
||||
n=s->s2->tmp.clear+s->s2->tmp.enc+keya - s->init_num;
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),n);
|
||||
len = 10 + (unsigned long)s->s2->tmp.clear + (unsigned long)s->s2->tmp.enc + (unsigned long)keya;
|
||||
if (len > SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER)
|
||||
{
|
||||
SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_MESSAGE_TOO_LONG);
|
||||
return -1;
|
||||
}
|
||||
n = (int)len - s->init_num;
|
||||
i = ssl2_read(s,(char *)&(p[s->init_num]),n);
|
||||
if (i != n) return(ssl2_part_read(s,SSL_F_GET_CLIENT_MASTER_KEY,i));
|
||||
p += 10;
|
||||
|
||||
memcpy(s->session->key_arg,&(p[s->s2->tmp.clear+s->s2->tmp.enc]),
|
||||
(unsigned int)keya);
|
||||
@ -410,8 +472,8 @@ static int get_client_master_key(SSL *s)
|
||||
* random master secret (Bleichenbacher attack) */
|
||||
if ((i < 0) ||
|
||||
((!is_export && (i != EVP_CIPHER_key_length(c)))
|
||||
|| (is_export && ((i != ek) || (s->s2->tmp.clear+i !=
|
||||
EVP_CIPHER_key_length(c))))))
|
||||
|| (is_export && ((i != ek) || (s->s2->tmp.clear+(unsigned int)i !=
|
||||
(unsigned int)EVP_CIPHER_key_length(c))))))
|
||||
{
|
||||
ERR_clear_error();
|
||||
if (is_export)
|
||||
@ -450,6 +512,7 @@ static int get_client_master_key(SSL *s)
|
||||
static int get_client_hello(SSL *s)
|
||||
{
|
||||
int i,n;
|
||||
unsigned long len;
|
||||
unsigned char *p;
|
||||
STACK_OF(SSL_CIPHER) *cs; /* a stack of SSL_CIPHERS */
|
||||
STACK_OF(SSL_CIPHER) *cl; /* the ones we want to use */
|
||||
@ -469,6 +532,7 @@ static int get_client_hello(SSL *s)
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),9-s->init_num);
|
||||
if (i < (9-s->init_num))
|
||||
return(ssl2_part_read(s,SSL_F_GET_CLIENT_HELLO,i));
|
||||
s->init_num = 9;
|
||||
|
||||
if (*(p++) != SSL2_MT_CLIENT_HELLO)
|
||||
{
|
||||
@ -493,15 +557,20 @@ static int get_client_hello(SSL *s)
|
||||
return(-1);
|
||||
}
|
||||
s->state=SSL2_ST_GET_CLIENT_HELLO_C;
|
||||
s->init_num=0;
|
||||
}
|
||||
|
||||
/* SSL2_ST_GET_CLIENT_HELLO_C */
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
n=s->s2->tmp.cipher_spec_length+s->s2->challenge_length+
|
||||
s->s2->tmp.session_id_length-s->init_num;
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),n);
|
||||
len = 9 + (unsigned long)s->s2->tmp.cipher_spec_length + (unsigned long)s->s2->challenge_length + (unsigned long)s->s2->tmp.session_id_length;
|
||||
if (len > SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER)
|
||||
{
|
||||
SSLerr(SSL_F_GET_CLIENT_HELLO,SSL_R_MESSAGE_TOO_LONG);
|
||||
return -1;
|
||||
}
|
||||
n = (int)len - s->init_num;
|
||||
i = ssl2_read(s,(char *)&(p[s->init_num]),n);
|
||||
if (i != n) return(ssl2_part_read(s,SSL_F_GET_CLIENT_HELLO,i));
|
||||
p += 9;
|
||||
|
||||
/* get session-id before cipher stuff so we can get out session
|
||||
* structure if it is cached */
|
||||
@ -707,7 +776,8 @@ static int server_hello(SSL *s)
|
||||
static int get_client_finished(SSL *s)
|
||||
{
|
||||
unsigned char *p;
|
||||
int i;
|
||||
int i, n;
|
||||
unsigned long len;
|
||||
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
if (s->state == SSL2_ST_GET_CLIENT_FINISHED_A)
|
||||
@ -715,6 +785,7 @@ static int get_client_finished(SSL *s)
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),1-s->init_num);
|
||||
if (i < 1-s->init_num)
|
||||
return(ssl2_part_read(s,SSL_F_GET_CLIENT_FINISHED,i));
|
||||
s->init_num += i;
|
||||
|
||||
if (*p != SSL2_MT_CLIENT_FINISHED)
|
||||
{
|
||||
@ -727,16 +798,18 @@ static int get_client_finished(SSL *s)
|
||||
SSLerr(SSL_F_GET_CLIENT_FINISHED,SSL_R_PEER_ERROR);
|
||||
return(-1);
|
||||
}
|
||||
s->init_num=0;
|
||||
s->state=SSL2_ST_GET_CLIENT_FINISHED_B;
|
||||
}
|
||||
|
||||
/* SSL2_ST_GET_CLIENT_FINISHED_B */
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),s->s2->conn_id_length-s->init_num);
|
||||
if (i < (int)s->s2->conn_id_length-s->init_num)
|
||||
len = 1 + (unsigned long)s->s2->conn_id_length;
|
||||
n = (int)len - s->init_num;
|
||||
i = ssl2_read(s,(char *)&(p[s->init_num]),n);
|
||||
if (i < n)
|
||||
{
|
||||
return(ssl2_part_read(s,SSL_F_GET_CLIENT_FINISHED,i));
|
||||
}
|
||||
p += 1;
|
||||
if (memcmp(p,s->s2->conn_id,(unsigned int)s->s2->conn_id_length) != 0)
|
||||
{
|
||||
ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
|
||||
@ -792,6 +865,7 @@ static int request_certificate(SSL *s)
|
||||
unsigned char *p,*p2,*buf2;
|
||||
unsigned char *ccd;
|
||||
int i,j,ctype,ret= -1;
|
||||
unsigned long len;
|
||||
X509 *x509=NULL;
|
||||
STACK_OF(X509) *sk=NULL;
|
||||
|
||||
@ -825,16 +899,28 @@ static int request_certificate(SSL *s)
|
||||
if (s->state == SSL2_ST_SEND_REQUEST_CERTIFICATE_C)
|
||||
{
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),6-s->init_num);
|
||||
if (i < 3)
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),6-s->init_num); /* try to read 6 octets ... */
|
||||
if (i < 3-s->init_num) /* ... but don't call ssl2_part_read now if we got at least 3
|
||||
* (probably NO-CERTIFICATE-ERROR) */
|
||||
{
|
||||
ret=ssl2_part_read(s,SSL_F_REQUEST_CERTIFICATE,i);
|
||||
goto end;
|
||||
}
|
||||
s->init_num += i;
|
||||
|
||||
if ((*p == SSL2_MT_ERROR) && (i >= 3))
|
||||
if ((s->init_num >= 3) && (p[0] == SSL2_MT_ERROR))
|
||||
{
|
||||
n2s(p,i);
|
||||
if (i != SSL2_PE_NO_CERTIFICATE)
|
||||
{
|
||||
/* not the error message we expected -- let ssl2_part_read handle it */
|
||||
s->init_num -= 3;
|
||||
ret = ssl2_part_read(s,SSL_F_REQUEST_CERTIFICATE, 3);
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* this is the one place where we can recover from an SSL 2.0 error */
|
||||
|
||||
if (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
|
||||
{
|
||||
ssl2_return_error(s,SSL2_PE_BAD_CERTIFICATE);
|
||||
@ -844,12 +930,18 @@ static int request_certificate(SSL *s)
|
||||
ret=1;
|
||||
goto end;
|
||||
}
|
||||
if ((*(p++) != SSL2_MT_CLIENT_CERTIFICATE) || (i < 6))
|
||||
if ((*(p++) != SSL2_MT_CLIENT_CERTIFICATE) || (s->init_num < 6))
|
||||
{
|
||||
ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
|
||||
SSLerr(SSL_F_REQUEST_CERTIFICATE,SSL_R_SHORT_READ);
|
||||
goto end;
|
||||
}
|
||||
if (s->init_num != 6)
|
||||
{
|
||||
SSLerr(SSL_F_REQUEST_CERTIFICATE, SSL_R_INTERNAL_ERROR);
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* ok we have a response */
|
||||
/* certificate type, there is only one right now. */
|
||||
ctype= *(p++);
|
||||
@ -862,18 +954,24 @@ static int request_certificate(SSL *s)
|
||||
n2s(p,i); s->s2->tmp.clen=i;
|
||||
n2s(p,i); s->s2->tmp.rlen=i;
|
||||
s->state=SSL2_ST_SEND_REQUEST_CERTIFICATE_D;
|
||||
s->init_num=0;
|
||||
}
|
||||
|
||||
/* SSL2_ST_SEND_REQUEST_CERTIFICATE_D */
|
||||
p=(unsigned char *)s->init_buf->data;
|
||||
j=s->s2->tmp.clen+s->s2->tmp.rlen-s->init_num;
|
||||
i=ssl2_read(s,(char *)&(p[s->init_num]),j);
|
||||
len = 6 + (unsigned long)s->s2->tmp.clen + (unsigned long)s->s2->tmp.rlen;
|
||||
if (len > SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER)
|
||||
{
|
||||
SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_MESSAGE_TOO_LONG);
|
||||
goto end;
|
||||
}
|
||||
j = (int)len - s->init_num;
|
||||
i = ssl2_read(s,(char *)&(p[s->init_num]),j);
|
||||
if (i < j)
|
||||
{
|
||||
ret=ssl2_part_read(s,SSL_F_REQUEST_CERTIFICATE,i);
|
||||
goto end;
|
||||
}
|
||||
p += 6;
|
||||
|
||||
x509=(X509 *)d2i_X509(NULL,&p,(long)s->s2->tmp.clen);
|
||||
if (x509 == NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user