[src/trunk]: src/crypto/external/bsd/openssl/dist/ssl fix bug introduced by l...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7f534bdffd85
branches:  trunk
changeset: 759369:7f534bdffd85
user:      drochner <drochner%NetBSD.org@localhost>
date:      Tue Dec 07 10:03:29 2010 +0000

description:
fix bug introduced by last security patch, from upstream CVS:
Don't assume a decode error if session tlsext_ecpointformatlist is
not NULL: it can be legitimately set elsewhere.

diffstat:

 crypto/external/bsd/openssl/dist/ssl/t1_lib.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 8405606338f9 -r 7f534bdffd85 crypto/external/bsd/openssl/dist/ssl/t1_lib.c
--- a/crypto/external/bsd/openssl/dist/ssl/t1_lib.c     Tue Dec 07 09:10:21 2010 +0000
+++ b/crypto/external/bsd/openssl/dist/ssl/t1_lib.c     Tue Dec 07 10:03:29 2010 +0000
@@ -778,8 +778,8 @@
                                {
                                if(s->session->tlsext_ecpointformatlist)
                                        {
-                                       *al = TLS1_AD_DECODE_ERROR;
-                                       return 0;
+                                       OPENSSL_free(s->session->tlsext_ecpointformatlist);
+                                       s->session->tlsext_ecpointformatlist = NULL;
                                        }
                                s->session->tlsext_ecpointformatlist_length = 0;
                                if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)