diff options
| author |   jsing <jsing@openbsd.org> | 2015-02-22 15:29:39 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-02-22 15:29:39 +0000 |
| commit | 3ee28e48cba6cc07e5e3ace3ee77ac1d78dde481 (patch) | |
| tree | 72f0c3134dc1d156bb7f28cc014acd22eb6456d2 /lib/libssl/ssl_lib.c | |
| parent | Remove IMPLEMENT_STACK_OF noops. (diff) | |
| download | wireguard-openbsd-3ee28e48cba6cc07e5e3ace3ee77ac1d78dde481.tar.xz wireguard-openbsd-3ee28e48cba6cc07e5e3ace3ee77ac1d78dde481.zip | |
There is not much point constructing an SSL_CIPHER, then calling
ssl3_cipher_get_value() to get the cipher suite value that we just
put in the struct - use the cipher suite value directly.
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 32feaa57e9e..58835931d24 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.99 2015/02/22 15:19:56 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.100 2015/02/22 15:29:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1406,12 +1406,8 @@ ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, unsigned char *p) * If p == q, no ciphers and caller indicates an error. Otherwise * add SCSV if not renegotiating. */ - if (p != q && !s->renegotiate) { - static SSL_CIPHER scsv = { - 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - s2n(ssl3_cipher_get_value(&scsv), p); - } + if (p != q && !s->renegotiate) + s2n(SSL3_CK_SCSV & SSL3_CK_VALUE_MASK, p); return (p - q); } |