diff options
| author |   jsing <jsing@openbsd.org> | 2014-08-24 14:36:45 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-08-24 14:36:45 +0000 |
| commit | ef88cf8e57c0c5ec5dabf3ef064c26ac8ec79f96 (patch) | |
| tree | a798ea060f7e234e3fd9d0ae03642d95bfcf840d /lib/libssl/src/ssl/s3_srvr.c | |
| parent | reduce indentation of main program by one tab, no functional change (diff) | |
| download | wireguard-openbsd-ef88cf8e57c0c5ec5dabf3ef064c26ac8ec79f96.tar.xz wireguard-openbsd-ef88cf8e57c0c5ec5dabf3ef064c26ac8ec79f96.zip | |
Replace the remaining uses of ssl3_put_cipher_by_char() with s2n and a
ssl3_cipher_get_value() helper function, which returns the cipher suite
value for the given cipher.
ok miod@
Diffstat (limited to 'lib/libssl/src/ssl/s3_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_srvr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c index 574910cda65..597ddd43105 100644 --- a/lib/libssl/src/ssl/s3_srvr.c +++ b/lib/libssl/src/ssl/s3_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_srvr.c,v 1.81 2014/08/11 04:46:42 miod Exp $ */ +/* $OpenBSD: s3_srvr.c,v 1.82 2014/08/24 14:36:45 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1250,8 +1250,8 @@ ssl3_send_server_hello(SSL *s) { unsigned char *buf; unsigned char *p, *d; - int i, sl; unsigned long l; + int sl; if (s->state == SSL3_ST_SW_SRVR_HELLO_A) { buf = (unsigned char *)s->init_buf->data; @@ -1298,8 +1298,7 @@ ssl3_send_server_hello(SSL *s) p += sl; /* put the cipher */ - i = ssl3_put_cipher_by_char(s->s3->tmp.new_cipher, p); - p += i; + s2n(ssl3_cipher_get_value(s->s3->tmp.new_cipher), p); /* put the compression method */ *(p++) = 0; |