Commit 4b06d778 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from 1.0.0-stable.

parent 6bb7dc1e

ssl/d1_both.c

+13 −13
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static int dtls1_add_cert_to_buf(BUF_MEM *buf, unsigned long *l, X509 *x) 
	n=i2d_X509(x,NULL);

	if (!BUF_MEM_grow_clean(buf,(int)(n+(*l)+3)))

		{

			SSLerr(SSL_F_DTLS1_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);

		SSLerr(SSL_F_DTLS1_ADD_CERT_TO_BUF,ERR_R_BUF_LIB);

		return 0;

		}

	p=(unsigned char *)&(buf->data[*l]);

ssl/d1_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -1353,7 +1353,7 @@ int dtls1_send_client_verify(SSL *s) 
				SHA_DIGEST_LENGTH,&(p[2]),

				(unsigned int *)&j,pkey->pkey.ec))

				{

				SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,

				SSLerr(SSL_F_DTLS1_SEND_CLIENT_VERIFY,

				    ERR_R_ECDSA_LIB);

				goto err;

				}

ssl/s3_both.c

+13 −13
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int ssl3_add_cert_to_buf(BUF_MEM *buf, unsigned long *l, X509 *x) 
	n=i2d_X509(x,NULL);

	if (!BUF_MEM_grow_clean(buf,(int)(n+(*l)+3)))

		{

				SSLerr(SSL_F_SSL3_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);

		SSLerr(SSL_F_SSL3_ADD_CERT_TO_BUF,ERR_R_BUF_LIB);

		return(-1);

		}

	p=(unsigned char *)&(buf->data[*l]);

ssl/ssl.h

+2 −0
Original line number Diff line number Diff line
@@ -1794,6 +1794,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_DO_DTLS1_WRITE				 245

#define SSL_F_DO_SSL3_WRITE				 104

#define SSL_F_DTLS1_ACCEPT				 246

#define SSL_F_DTLS1_ADD_CERT_TO_BUF			 295

#define SSL_F_DTLS1_BUFFER_RECORD			 247

#define SSL_F_DTLS1_CLIENT_HELLO			 248

#define SSL_F_DTLS1_CONNECT				 249
@@ -1847,6 +1848,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_SSL2_SET_CERTIFICATE			 126

#define SSL_F_SSL2_WRITE				 127

#define SSL_F_SSL3_ACCEPT				 128

#define SSL_F_SSL3_ADD_CERT_TO_BUF			 296

#define SSL_F_SSL3_CALLBACK_CTRL			 233

#define SSL_F_SSL3_CHANGE_CIPHER_STATE			 129

#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM		 130

ssl/ssl_err.c

+3 −1
Original line number Diff line number Diff line 
/* ssl/ssl_err.c */

/* ====================================================================

 * Copyright (c) 1999-2008 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2009 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
@@ -78,6 +78,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_DO_DTLS1_WRITE),	"DO_DTLS1_WRITE"},

{ERR_FUNC(SSL_F_DO_SSL3_WRITE),	"DO_SSL3_WRITE"},

{ERR_FUNC(SSL_F_DTLS1_ACCEPT),	"DTLS1_ACCEPT"},

{ERR_FUNC(SSL_F_DTLS1_ADD_CERT_TO_BUF),	"DTLS1_ADD_CERT_TO_BUF"},

{ERR_FUNC(SSL_F_DTLS1_BUFFER_RECORD),	"DTLS1_BUFFER_RECORD"},

{ERR_FUNC(SSL_F_DTLS1_CLIENT_HELLO),	"DTLS1_CLIENT_HELLO"},

{ERR_FUNC(SSL_F_DTLS1_CONNECT),	"DTLS1_CONNECT"},
@@ -131,6 +132,7 @@ static ERR_STRING_DATA SSL_str_functs[]= 
{ERR_FUNC(SSL_F_SSL2_SET_CERTIFICATE),	"SSL2_SET_CERTIFICATE"},

{ERR_FUNC(SSL_F_SSL2_WRITE),	"SSL2_WRITE"},

{ERR_FUNC(SSL_F_SSL3_ACCEPT),	"SSL3_ACCEPT"},

{ERR_FUNC(SSL_F_SSL3_ADD_CERT_TO_BUF),	"SSL3_ADD_CERT_TO_BUF"},

{ERR_FUNC(SSL_F_SSL3_CALLBACK_CTRL),	"SSL3_CALLBACK_CTRL"},

{ERR_FUNC(SSL_F_SSL3_CHANGE_CIPHER_STATE),	"SSL3_CHANGE_CIPHER_STATE"},

{ERR_FUNC(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM),	"SSL3_CHECK_CERT_AND_ALGORITHM"},