summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorguenther <>2014-08-07 22:27:28 +0000
committerguenther <>2014-08-07 22:27:28 +0000
commit32554492a8d665d7c0517b374f2ea31089caa176 (patch)
tree5ba849d8eb1c2969826e91806bf6e0441e91d5ed /src
parent7ebd67cca8deb00f38709e7165e966f7e6b20650 (diff)
downloadopenbsd-32554492a8d665d7c0517b374f2ea31089caa176.tar.gz
openbsd-32554492a8d665d7c0517b374f2ea31089caa176.tar.bz2
openbsd-32554492a8d665d7c0517b374f2ea31089caa176.zip
Correct test reversed during merge of fix for CVE-2014-3509
pointed out by Watson Ladd (watson (at) matasano.com) ok deraadt@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/t1_lib.c4
-rw-r--r--src/lib/libssl/t1_lib.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/t1_lib.c b/src/lib/libssl/src/ssl/t1_lib.c
index eebe6897ef..c25f10bfab 100644
--- a/src/lib/libssl/src/ssl/t1_lib.c
+++ b/src/lib/libssl/src/ssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.53 2014/08/06 23:16:16 deraadt Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.54 2014/08/07 22:27:28 guenther Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1339,7 +1339,7 @@ ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
1339 *al = TLS1_AD_DECODE_ERROR; 1339 *al = TLS1_AD_DECODE_ERROR;
1340 return 0; 1340 return 0;
1341 } 1341 }
1342 if (s->hit) { 1342 if (!s->hit) {
1343 free(s->session->tlsext_ecpointformatlist); 1343 free(s->session->tlsext_ecpointformatlist);
1344 s->session->tlsext_ecpointformatlist_length = 0; 1344 s->session->tlsext_ecpointformatlist_length = 0;
1345 1345
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index eebe6897ef..c25f10bfab 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.53 2014/08/06 23:16:16 deraadt Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.54 2014/08/07 22:27:28 guenther Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1339,7 +1339,7 @@ ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
1339 *al = TLS1_AD_DECODE_ERROR; 1339 *al = TLS1_AD_DECODE_ERROR;
1340 return 0; 1340 return 0;
1341 } 1341 }
1342 if (s->hit) { 1342 if (!s->hit) {
1343 free(s->session->tlsext_ecpointformatlist); 1343 free(s->session->tlsext_ecpointformatlist);
1344 s->session->tlsext_ecpointformatlist_length = 0; 1344 s->session->tlsext_ecpointformatlist_length = 0;
1345 1345