diff options
| author |   jsing <jsing@openbsd.org> | 2014-10-05 14:53:06 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-10-05 14:53:06 +0000 |
| commit | b143dcade6b73fd9986efa24fdc7354b9131344a (patch) | |
| tree | 0a4b69b143d37afdd8fac632b063bb5143cfabf6 /lib/libssl/src/ssl/t1_lib.c | |
| parent | Make tls1_get_formatlist() behave the same as tls1_get_curvelist() and (diff) | |
| download | wireguard-openbsd-b143dcade6b73fd9986efa24fdc7354b9131344a.tar.xz wireguard-openbsd-b143dcade6b73fd9986efa24fdc7354b9131344a.zip | |
Use tls1_get_curvelist() in ssl_add_clienthello_tlsext(), rather than
hand rolling the same code.
ok miod@
Diffstat (limited to 'lib/libssl/src/ssl/t1_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/t1_lib.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/libssl/src/ssl/t1_lib.c b/lib/libssl/src/ssl/t1_lib.c index 0b3f0f3566b..ce827caae72 100644 --- a/lib/libssl/src/ssl/t1_lib.c +++ b/lib/libssl/src/ssl/t1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_lib.c,v 1.61 2014/10/05 14:47:30 jsing Exp $ */ +/* $OpenBSD: t1_lib.c,v 1.62 2014/10/05 14:53:06 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -743,16 +743,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) /* * Add TLS extension EllipticCurves to the ClientHello message. */ - plist = s->tlsext_ellipticcurvelist; - plistlen = s->tlsext_ellipticcurvelist_length; - - /* - * If we have a custom curve list use it otherwise use default. - */ - if (plist == NULL) { - plist = eccurves_default; - plistlen = sizeof(eccurves_default); - } + tls1_get_curvelist(s, 0, &plist, &plistlen); if ((size_t)(limit - ret) < 6) return NULL; |