summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornectar <nectar@FreeBSD.org>2004-03-17 12:11:08 +0000
committernectar <nectar@FreeBSD.org>2004-03-17 12:11:08 +0000
commit5899dbda42ade7a54383f13a3017ff40c739b8bf (patch)
treef68547552dcbc5b02e6a7ac54c1fa156841c7e9d
parentbe8249453471d52d6cf99cdbbf6091141bd287e6 (diff)
parente8232d78abaf5a170e34e0742d0042a65bcaafe4 (diff)
downloadFreeBSD-src-5899dbda42ade7a54383f13a3017ff40c739b8bf.zip
FreeBSD-src-5899dbda42ade7a54383f13a3017ff40c739b8bf.tar.gz
This commit was generated by cvs2svn to compensate for changes in r127114,
which included commits to RCS files with non-trunk default branches.
-rw-r--r--crypto/openssl/ssl/s3_pkt.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/s3_pkt.c b/crypto/openssl/ssl/s3_pkt.c
index 3f88429..9f3e513 100644
--- a/crypto/openssl/ssl/s3_pkt.c
+++ b/crypto/openssl/ssl/s3_pkt.c
@@ -1085,6 +1085,14 @@ start:
goto err;
}
+ /* Check we have a cipher to change to */
+ if (s->s3->tmp.new_cipher == NULL)
+ {
+ i=SSL_AD_UNEXPECTED_MESSAGE;
+ SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY);
+ goto err;
+ }
+
rr->length=0;
if (s->msg_callback)
OpenPOWER on IntegriCloud