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/d1_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/d1_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/d1_srvr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c index 9fdd025e2d8..4532a07da5c 100644 --- a/lib/libssl/src/ssl/d1_srvr.c +++ b/lib/libssl/src/ssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.36 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.37 2014/08/24 14:36:45 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -898,7 +898,6 @@ dtls1_send_server_hello(SSL *s) { unsigned char *buf; unsigned char *p, *d; - int i; unsigned int sl; unsigned long l; @@ -940,8 +939,7 @@ dtls1_send_server_hello(SSL *s) /* put the cipher */ if (s->s3->tmp.new_cipher == NULL) return -1; - 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; |